summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-01-06 12:07:52 -0800
committerRichard Linden <none@none>2012-01-06 12:07:52 -0800
commit757a955bd700eb4f838762dcbe789a77ee052064 (patch)
treed460d677367477e2edfbadd84d9c8137f6f8237d /indra/newview/skins
parent377e35af14ec8e6aa689a9aa9817705b4d699e83 (diff)
Looking for better fix to EXP-1693 - date localization
Backed out changeset: 4f3024e9d629
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml3
-rw-r--r--indra/newview/skins/default/xui/fr/sidepanel_item_info.xml2
2 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 492e51e0fd..9752a07b66 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -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 0b5333fc80..95649d3934 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)