From d4b6b04af9ea1429c3a67ec7010aafbd10f46a4d Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Thu, 3 Jun 2010 17:03:09 +0300
Subject: EXT-7013 FIX due to localization tools restrictions hardcode using of
 special strings for Japanese

reviewed by Mike Antipov https://codereview.productengine.com/secondlife/r/504/

--HG--
branch : product-engine
---
 indra/newview/llappviewer.cpp                  | 22 ++++++++++++++--------
 indra/newview/skins/default/xui/en/strings.xml | 21 ++++++++-------------
 indra/newview/skins/default/xui/ja/strings.xml | 18 ------------------
 3 files changed, 22 insertions(+), 39 deletions(-)

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index deafb20af7..2d8fead10e 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -893,14 +893,20 @@ bool LLAppViewer::init()
 	
 	LLViewerMedia::initClass();
 
-	LLStringOps::setupWeekDaysNames(LLTrans::getString("dateTimeWeekdaysNames"));
-	LLStringOps::setupWeekDaysShortNames(LLTrans::getString("dateTimeWeekdaysShortNames"));
-	LLStringOps::setupMonthNames(LLTrans::getString("dateTimeMonthNames"));
-	LLStringOps::setupMonthShortNames(LLTrans::getString("dateTimeMonthShortNames"));
-	LLStringOps::setupDayFormat(LLTrans::getString("dateTimeDayFormat"));
-
-	LLStringOps::sAM = LLTrans::getString("dateTimeAM");
-	LLStringOps::sPM = LLTrans::getString("dateTimePM");
+	//EXT-7013 - On windows for some locale (Japanese) standard 
+	//datetime formatting functions didn't support some parameters such as "weekday".
+	std::string language = LLControlGroup::getInstance(sGlobalSettingsName)->getString("Language");
+	if(language == "ja")
+	{
+		LLStringOps::setupWeekDaysNames(LLTrans::getString("dateTimeWeekdaysNames"));
+		LLStringOps::setupWeekDaysShortNames(LLTrans::getString("dateTimeWeekdaysShortNames"));
+		LLStringOps::setupMonthNames(LLTrans::getString("dateTimeMonthNames"));
+		LLStringOps::setupMonthShortNames(LLTrans::getString("dateTimeMonthShortNames"));
+		LLStringOps::setupDayFormat(LLTrans::getString("dateTimeDayFormat"));
+
+		LLStringOps::sAM = LLTrans::getString("dateTimeAM");
+		LLStringOps::sPM = LLTrans::getString("dateTimePM");
+	}
 
 	return true;
 }
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 9d7079a495..9b156377a7 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3189,18 +3189,13 @@ Abuse Report</string>
   </string>
 
   <!-- overriding datetime formating. 
-	leave emtpy in for current localization this is not needed 
-	list of values should be separated with ':'
-        example:
-	<string name="dateTimeWeekdaysShortNames">
-	Son:Mon:Tue:Wed:Thu:Fri:Sat
-	</string>  	
+	didn't translate if this is not needed for current localization 
   -->
-  <string name="dateTimeWeekdaysNames"></string>
-  <string name="dateTimeWeekdaysShortNames"></string>
-  <string name="dateTimeMonthNames"></string>
-  <string name="dateTimeMonthShortNames"></string>
-  <string name="dateTimeDayFormat"></string>
-  <string name="dateTimeAM"></string>
-  <string name="dateTimePM"></string>
+  <string name="dateTimeWeekdaysNames">Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday</string>
+  <string name="dateTimeWeekdaysShortNames">Sun:Mon:Tue:Wed:Thu:Fri:Sat</string>
+  <string name="dateTimeMonthNames">January:February:March:April:May:June:July:August:September:October:November:December</string>
+  <string name="dateTimeMonthShortNames">Jan:Feb:Mar:Apr:May:Jun:Jul:Aug:Sep:Oct:Nov:Dec</string>
+  <string name="dateTimeDayFormat">[MDAY]</string>
+  <string name="dateTimeAM">AM</string>
+  <string name="dateTimePM">PM</string>
   </strings>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index dfc12bc1cb..d59699552d 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -3762,22 +3762,4 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="texture_load_dimensions_error">
 		[WIDTH]*[HEIGHT] 以上の画像は読み込めません
 	</string>
-	<!-- overriding datetime formating. leave emtpy in for current localization this is not needed -->
-	<string name="dateTimeWeekdaysNames">
-	Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday
-	</string>
-	<string name="dateTimeWeekdaysShortNames">
-	Son:Mon:Tue:Wed:Thu:Fri:Sat
-	</string>
-	<string name="dateTimeMonthNames">
-	January:February:March:April:May:June:July:August:September:October:November:December
-	</string>
-	<string name="dateTimeMonthNames">
-	Jan:Feb:Mar:Apr:May:Jun:Jul:Aug:Sep:Oct:Nov:Dec
-	</string>
-	<string name="dateTimeDayFormat">
-		[MDAY] D
-	</string>
-        <string name="dateTimeAM">AM</string>
-        <string name="dateTimePM">PM</string>
 </strings>
-- 
cgit v1.2.3