diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp
index 1193a4ef8db65facbecbabe5ddad7c5923fa3631..e7fe6568085e8b0691f160bf312359f6f7822c42 100644
--- a/indra/llcommon/llstring.cpp
+++ b/indra/llcommon/llstring.cpp
@@ -1122,11 +1122,6 @@ bool LLStringUtil::formatDatetime(std::string& replacement, std::string token,
struct tm * gmt = gmtime (&loc_seconds);
replacement = LLStringOps::sMonthList[gmt->tm_mon];
}
- else if(LLStringOps::sMonthShortList.size() == 12 && code == "%b")
- {
- struct tm * gmt = gmtime (&loc_seconds);
- replacement = LLStringOps::sMonthShortList[gmt->tm_mon];
- }
else if( !LLStringOps::sDayFormat.empty() && code == "%d" )
{
struct tm * gmt = gmtime (&loc_seconds);
diff --git a/indra/llui/llscrolllistcell.cpp b/indra/llui/llscrolllistcell.cpp
index 786e18b18783966547b1453e879cc331ee4d7c3a..9d25c7180dd4db401d5089b39fc9ddd6847f5eb3 100644
--- a/indra/llui/llscrolllistcell.cpp
+++ b/indra/llui/llscrolllistcell.cpp
@@ -29,8 +29,6 @@
#include "llscrolllistcell.h"
-#include "lltrans.h"
-
#include "llcheckboxctrl.h"
#include "llui.h" // LLUIImage
#include "lluictrlfactory.h"
@@ -430,13 +428,7 @@ LLScrollListDate::LLScrollListDate( const LLScrollListCell::Params& p)
void LLScrollListDate::setValue(const LLSD& value)
{
mDate = value.asDate();
-
- std::string date_str = LLTrans::getString("ScrollListCellDateFormat");
- LLSD substitution;
- substitution["datetime"] = mDate.secondsSinceEpoch();
- LLStringUtil::format(date_str, substitution);
-
- LLScrollListText::setValue(date_str);
+ LLScrollListText::setValue(mDate.asRFC1123());
}
const LLSD LLScrollListDate::getValue() const
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 33d4563feb5cc15aeb17f83d29e26322d153a3aa..0861fe85a84475ad45f3a32e6baa7a97c5d07e76 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1044,14 +1044,21 @@ bool LLAppViewer::init()
LLTextUtil::TextHelpers::iconCallbackCreationFunction = create_text_segment_icon_from_url_match;
- 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".
+ //Names for days and months localized in xml are also useful for Polish locale(STORM-107).
+ std::string language = gSavedSettings.getString("Language");
+ if(language == "ja" || language == "pl")
+ {
+ 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");
+ }
LLAgentLanguage::init();
diff --git a/indra/newview/llpanelgrouplandmoney.cpp b/indra/newview/llpanelgrouplandmoney.cpp
index b6c0c2ee24c9d34b51e8e4157a4087c60bfb4396..e66dd5690c2fa4f6132d98e256d10499dfe41eb1 100644
--- a/indra/newview/llpanelgrouplandmoney.cpp
+++ b/indra/newview/llpanelgrouplandmoney.cpp
@@ -1447,7 +1447,8 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg,
text.append(time_str);
text.append(".\n\n");
- text.append(llformat("%-24s %6d L$\n\n", LLTrans::getString("GroupMoneyBalance").c_str(), balance ));
+ text.append(llformat("%-23sL$%6d\n", LLTrans::getString("GroupMoneyBalance").c_str(), balance ));
+ text.append(1, '\n');
}
// [DEV-29503] Hide the individual info since
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index adde982c60c01f2c3e25ffefb1a2ef53f20c8983..38b680ba86553a21a7f632183d2015d4848a8249 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -225,22 +225,13 @@ Hover your mouse over the options for more help.
height="23"
increment="1"
label_width="15"
+ label="L$"
layout="topleft"
max_val="99999"
left="30"
name="spin_enrollment_fee"
tool_tip="New members must pay this fee to join the group when Enrollment Fee is checked."
- width="150" />
- <text
- follows="left|top"
- type="string"
- height="16"
- left_pad="2"
- name="currency_label"
- top_delta="5"
- width="18">
- L$
- </text>
+ width="170" />
<combo_box
follows="left|top"
height="23"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 2ae56bc7292b29cacc1f37c8db0acb06ab92cfaa..9752a07b66673a1ae36198b9e4c0238d821d938c 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2272,7 +2272,7 @@ Returns a string with the requested data about the region
<string name="NextStipendDay" value="The next stipend day is " />
<string name="GroupPlanningDate">[mthnum,datetime,utc]/[day,datetime,utc]/[year,datetime,utc]</string>
<string name="GroupIndividualShare" value=" Group Individual Share" />
- <string name="GroupColumn" value="Group" />
+ <string name="GroupColumn" value=" Group" />
<string name="Balance">Balance</string>
<string name="Credits">Credits</string>
<string name="Debits">Debits</string>
@@ -3503,9 +3503,6 @@ Abuse Report</string>
<string name="dateTimeDayFormat">[MDAY]</string>
<string name="dateTimeAM">AM</string>
<string name="dateTimePM">PM</string>
-
- <!-- Format string for displaying a localized date in a scroll list cell of type "date" -->
- <string name="ScrollListCellDateFormat">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</string>
<!-- currency formatting -->
<string name="LocalEstimateUSD">US$ [AMOUNT]</string>
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml b/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml
index 0b5333fc80e8db03b2154677ab1dd35f48a63410..95649d39348d06ab42ffc433929c3ee268e0ec58 100644
--- a/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml
@@ -13,7 +13,7 @@
Le propriétaire peut :
</panel.string>
<panel.string name="acquiredDate">
- [wkday,datetime,local] [day,datetime,local] [mth,datetime,local] [year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
+ [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
</panel.string>
<panel.string name="origin_inventory">
(inventaire)