Merge pull request #1182 from zewt/localizedstrings-to-utf8

Fix the Windows build on Japanese systems.
xbmc · Aug 26, 2012 · 8188e27 · 8188e27
2 parents f128571 + 5a48630
commit 8188e27
Showing 1 changed file with 21 additions and 25 deletions.
diff --git a/xbmc/guilib/LocalizeStrings.cpp b/xbmc/guilib/LocalizeStrings.cpp
@@ -203,33 +203,29 @@ bool CLocalizeStrings::Load(const CStdString& strPathName, const CStdString& str
   if (bLoadFallback)
     LoadStr2Mem(strPathName, SOURCE_LANGUAGE, encoding);
 
-  CStdString encoding_thisfile = "ISO-8859-1";
-  // we have ANSI encoding for LocalizeStrings.cpp therefore we need to use this encoding
-  // when we add the degree strings
-
   // fill in the constant strings
   m_strings[20022].strTranslated = "";
-  m_strings[20027].strTranslated = ToUTF8(encoding_thisfile, "°F");
-  m_strings[20028].strTranslated = ToUTF8(encoding_thisfile, "K");
-  m_strings[20029].strTranslated = ToUTF8(encoding_thisfile, "°C");
-  m_strings[20030].strTranslated = ToUTF8(encoding_thisfile, "°Ré");
-  m_strings[20031].strTranslated = ToUTF8(encoding_thisfile, "°Ra");
-  m_strings[20032].strTranslated = ToUTF8(encoding_thisfile, "°Rø");
-  m_strings[20033].strTranslated = ToUTF8(encoding_thisfile, "°De");
-  m_strings[20034].strTranslated = ToUTF8(encoding_thisfile, "°N");
-
-  m_strings[20200].strTranslated = ToUTF8(encoding_thisfile, "km/h");
-  m_strings[20201].strTranslated = ToUTF8(encoding_thisfile, "m/min");
-  m_strings[20202].strTranslated = ToUTF8(encoding_thisfile, "m/s");
-  m_strings[20203].strTranslated = ToUTF8(encoding_thisfile, "ft/h");
-  m_strings[20204].strTranslated = ToUTF8(encoding_thisfile, "ft/min");
-  m_strings[20205].strTranslated = ToUTF8(encoding_thisfile, "ft/s");
-  m_strings[20206].strTranslated = ToUTF8(encoding_thisfile, "mph");
-  m_strings[20207].strTranslated = ToUTF8(encoding_thisfile, "kts");
-  m_strings[20208].strTranslated = ToUTF8(encoding_thisfile, "Beaufort");
-  m_strings[20209].strTranslated = ToUTF8(encoding_thisfile, "inch/s");
-  m_strings[20210].strTranslated = ToUTF8(encoding_thisfile, "yard/s");
-  m_strings[20211].strTranslated = ToUTF8(encoding_thisfile, "Furlong/Fortnight");
+  m_strings[20027].strTranslated = "°F";
+  m_strings[20028].strTranslated = "K";
+  m_strings[20029].strTranslated = "°C";
+  m_strings[20030].strTranslated = "°Ré";
+  m_strings[20031].strTranslated = "°Ra";
+  m_strings[20032].strTranslated = "°Rø";
+  m_strings[20033].strTranslated = "°De";
+  m_strings[20034].strTranslated = "°N";
+
+  m_strings[20200].strTranslated = "km/h";
+  m_strings[20201].strTranslated = "m/min";
+  m_strings[20202].strTranslated = "m/s";
+  m_strings[20203].strTranslated = "ft/h";
+  m_strings[20204].strTranslated = "ft/min";
+  m_strings[20205].strTranslated = "ft/s";
+  m_strings[20206].strTranslated = "mph";
+  m_strings[20207].strTranslated = "kts";
+  m_strings[20208].strTranslated = "Beaufort";
+  m_strings[20209].strTranslated = "inch/s";
+  m_strings[20210].strTranslated = "yard/s";
+  m_strings[20211].strTranslated = "Furlong/Fortnight";
 
   return true;
 }