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
LMS-Community · Dec 12, 2010 · 3cfeb4a · 3cfeb4a
1 parent 05e0a11
commit 3cfeb4a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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 ) {