From 3cfeb4a7646cf79d8ce5cb01a03ec12af37d08da Mon Sep 17 00:00:00 2001
From: Andy Grundman <agrundman@logitech.com>
Date: Sun, 12 Dec 2010 13:33:59 +0000
Subject: [PATCH] Use ICU collation with SQLite if available

git-svn-id: file:///home/awy/mirror/slim/7.6/trunk/server@31618 62299810-d8cb-41fd-93b7-d32162e5a4a4
---
 Slim/Utils/SQLiteHelper.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Slim/Utils/SQLiteHelper.pm b/Slim/Utils/SQLiteHelper.pm
index 9de373349b1..5b4cdafef5a 100644
--- a/Slim/Utils/SQLiteHelper.pm
+++ b/Slim/Utils/SQLiteHelper.pm
@@ -173,12 +173,12 @@ sub collate {
 			: $lang eq 'IT' ? 'it_IT'
 			: $lang eq 'JA' ? 'ja_JP'
 			: $lang eq 'NL' ? 'nl_NL'
-			: $lang eq 'NO' ? 'no_NO'
+			: $lang eq 'NO' ? 'nb_NO' # Norwegian Bokmål
 			: $lang eq 'PL' ? 'pl_PL'
 			: $lang eq 'PT' ? 'pt_PT'
 			: $lang eq 'RU' ? 'ru_RU'
 			: $lang eq 'SV' ? 'sv_SE'
-			: $lang eq 'ZH_CN' ? 'zh_CN'
+			: $lang eq 'ZH_CN' ? 'zh'
 			: 'en_US';
 		
 		if ( $currentICU ne $collation ) {