Renamed variables for short month names

Month may conflicted because it has the same name both in full and short representation

diff --git a/com.woltlab.wcf/templates/headInclude.tpl b/com.woltlab.wcf/templates/headInclude.tpl
index 7557613f989d233d5194ab13e90eba3e0ef74d23..c98d78a1e418abb25f9423b0e60739447c50af9b 100644 (file)
--- a/com.woltlab.wcf/templates/headInclude.tpl
+++ b/com.woltlab.wcf/templates/headInclude.tpl
@@ -78,7 +78,7 @@
                        '__days': [ '{lang}wcf.date.day.sunday{/lang}', '{lang}wcf.date.day.monday{/lang}', '{lang}wcf.date.day.tuesday{/lang}', '{lang}wcf.date.day.wednesday{/lang}', '{lang}wcf.date.day.thursday{/lang}', '{lang}wcf.date.day.friday{/lang}', '{lang}wcf.date.day.saturday{/lang}' ],
                        '__daysShort': [ '{lang}wcf.date.day.sun{/lang}', '{lang}wcf.date.day.mon{/lang}', '{lang}wcf.date.day.tue{/lang}', '{lang}wcf.date.day.wed{/lang}', '{lang}wcf.date.day.thu{/lang}', '{lang}wcf.date.day.fri{/lang}', '{lang}wcf.date.day.sat{/lang}' ],
                        '__months': [ '{lang}wcf.date.month.january{/lang}', '{lang}wcf.date.month.february{/lang}', '{lang}wcf.date.month.march{/lang}', '{lang}wcf.date.month.april{/lang}', '{lang}wcf.date.month.may{/lang}', '{lang}wcf.date.month.june{/lang}', '{lang}wcf.date.month.july{/lang}', '{lang}wcf.date.month.august{/lang}', '{lang}wcf.date.month.september{/lang}', '{lang}wcf.date.month.october{/lang}', '{lang}wcf.date.month.november{/lang}', '{lang}wcf.date.month.december{/lang}' ], 
-                       '__monthsShort': [ '{lang}wcf.date.month.jan{/lang}', '{lang}wcf.date.month.feb{/lang}', '{lang}wcf.date.month.mar{/lang}', '{lang}wcf.date.month.apr{/lang}', '{lang}wcf.date.month.may{/lang}', '{lang}wcf.date.month.jun{/lang}', '{lang}wcf.date.month.jul{/lang}', '{lang}wcf.date.month.aug{/lang}', '{lang}wcf.date.month.sep{/lang}', '{lang}wcf.date.month.oct{/lang}', '{lang}wcf.date.month.nov{/lang}', '{lang}wcf.date.month.dec{/lang}' ],
+                       '__monthsShort': [ '{lang}wcf.date.month.short.jan{/lang}', '{lang}wcf.date.month.short.feb{/lang}', '{lang}wcf.date.month.short.mar{/lang}', '{lang}wcf.date.month.short.apr{/lang}', '{lang}wcf.date.month.short.may{/lang}', '{lang}wcf.date.month.short.jun{/lang}', '{lang}wcf.date.month.short.jul{/lang}', '{lang}wcf.date.month.short.aug{/lang}', '{lang}wcf.date.month.short.sep{/lang}', '{lang}wcf.date.month.short.oct{/lang}', '{lang}wcf.date.month.short.nov{/lang}', '{lang}wcf.date.month.short.dec{/lang}' ],
                        'wcf.clipboard.item.unmarkAll': '{lang}wcf.clipboard.item.unmarkAll{/lang}',
                        'wcf.date.relative.now': '{lang}wcf.date.relative.now{/lang}',
                        'wcf.date.relative.minutes': '{capture assign=relativeMinutes}{lang}wcf.date.relative.minutes{/lang}{/capture}{@$relativeMinutes|encodeJS}',

diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index 739297b5fcb4fa70137ce6f85c0a5356e941d84d..0ea4489f79af662e53995554a6e660697a8e0faf 100644 (file)
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -48,7 +48,7 @@
                                '__days': [ '{lang}wcf.date.day.sunday{/lang}', '{lang}wcf.date.day.monday{/lang}', '{lang}wcf.date.day.tuesday{/lang}', '{lang}wcf.date.day.wednesday{/lang}', '{lang}wcf.date.day.thursday{/lang}', '{lang}wcf.date.day.friday{/lang}', '{lang}wcf.date.day.saturday{/lang}' ],
                                '__daysShort': [ '{lang}wcf.date.day.sun{/lang}', '{lang}wcf.date.day.mon{/lang}', '{lang}wcf.date.day.tue{/lang}', '{lang}wcf.date.day.wed{/lang}', '{lang}wcf.date.day.thu{/lang}', '{lang}wcf.date.day.fri{/lang}', '{lang}wcf.date.day.sat{/lang}' ],
                                '__months': [ '{lang}wcf.date.month.january{/lang}', '{lang}wcf.date.month.february{/lang}', '{lang}wcf.date.month.march{/lang}', '{lang}wcf.date.month.april{/lang}', '{lang}wcf.date.month.may{/lang}', '{lang}wcf.date.month.june{/lang}', '{lang}wcf.date.month.july{/lang}', '{lang}wcf.date.month.august{/lang}', '{lang}wcf.date.month.september{/lang}', '{lang}wcf.date.month.october{/lang}', '{lang}wcf.date.month.november{/lang}', '{lang}wcf.date.month.december{/lang}' ], 
-                               '__monthsShort': [ '{lang}wcf.date.month.jan{/lang}', '{lang}wcf.date.month.feb{/lang}', '{lang}wcf.date.month.mar{/lang}', '{lang}wcf.date.month.apr{/lang}', '{lang}wcf.date.month.may{/lang}', '{lang}wcf.date.month.jun{/lang}', '{lang}wcf.date.month.jul{/lang}', '{lang}wcf.date.month.aug{/lang}', '{lang}wcf.date.month.sep{/lang}', '{lang}wcf.date.month.oct{/lang}', '{lang}wcf.date.month.nov{/lang}', '{lang}wcf.date.month.dec{/lang}' ],
+                               '__monthsShort': [ '{lang}wcf.date.month.short.jan{/lang}', '{lang}wcf.date.month.short.feb{/lang}', '{lang}wcf.date.month.short.mar{/lang}', '{lang}wcf.date.month.short.apr{/lang}', '{lang}wcf.date.month.short.may{/lang}', '{lang}wcf.date.month.short.jun{/lang}', '{lang}wcf.date.month.short.jul{/lang}', '{lang}wcf.date.month.short.aug{/lang}', '{lang}wcf.date.month.short.sep{/lang}', '{lang}wcf.date.month.short.oct{/lang}', '{lang}wcf.date.month.short.nov{/lang}', '{lang}wcf.date.month.short.dec{/lang}' ],
                                'wcf.acp.search.noResults': '{lang}wcf.acp.search.noResults{/lang}',
                                'wcf.clipboard.item.unmarkAll': '{lang}wcf.clipboard.item.unmarkAll{/lang}',
                                'wcf.date.relative.now': '{lang}wcf.date.relative.now{/lang}',

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index baade85911c49a89851227c15d5f116b1f0fb52c..5c7956e77f0bdc8af2d22e15731fd08f4a7bb32a 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1535,18 +1535,18 @@ Fehler sind beispielsweise:
                <item name="wcf.date.month.october"><![CDATA[Oktober]]></item>
                <item name="wcf.date.month.november"><![CDATA[November]]></item>
                <item name="wcf.date.month.december"><![CDATA[Dezember]]></item>
-               <item name="wcf.date.month.jan"><![CDATA[Jan]]></item>
-               <item name="wcf.date.month.feb"><![CDATA[Feb]]></item>
-               <item name="wcf.date.month.mar"><![CDATA[Mrz]]></item>
-               <item name="wcf.date.month.apr"><![CDATA[Apr]]></item>
-               <item name="wcf.date.month.may"><![CDATA[Mai]]></item>
-               <item name="wcf.date.month.jun"><![CDATA[Jun]]></item>
-               <item name="wcf.date.month.jul"><![CDATA[Jul]]></item>
-               <item name="wcf.date.month.aug"><![CDATA[Aug]]></item>
-               <item name="wcf.date.month.sep"><![CDATA[Sep]]></item>
-               <item name="wcf.date.month.oct"><![CDATA[Okt]]></item>
-               <item name="wcf.date.month.nov"><![CDATA[Nov]]></item>
-               <item name="wcf.date.month.dec"><![CDATA[Dez]]></item>
+               <item name="wcf.date.month.short.jan"><![CDATA[Jan]]></item>
+               <item name="wcf.date.month.short.feb"><![CDATA[Feb]]></item>
+               <item name="wcf.date.month.short.mar"><![CDATA[Mrz]]></item>
+               <item name="wcf.date.month.short.apr"><![CDATA[Apr]]></item>
+               <item name="wcf.date.month.short.may"><![CDATA[Mai]]></item>
+               <item name="wcf.date.month.short.jun"><![CDATA[Jun]]></item>
+               <item name="wcf.date.month.short.jul"><![CDATA[Jul]]></item>
+               <item name="wcf.date.month.short.aug"><![CDATA[Aug]]></item>
+               <item name="wcf.date.month.short.sep"><![CDATA[Sep]]></item>
+               <item name="wcf.date.month.short.oct"><![CDATA[Okt]]></item>
+               <item name="wcf.date.month.short.nov"><![CDATA[Nov]]></item>
+               <item name="wcf.date.month.short.dec"><![CDATA[Dez]]></item>
                <item name="wcf.date.day.sun"><![CDATA[Son]]></item>
                <item name="wcf.date.day.mon"><![CDATA[Mon]]></item>
                <item name="wcf.date.day.tue"><![CDATA[Die]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index d9699f18b4d0c9c88e39558dab706d9ceba79d97..63a6a89cbaa83c0fb846ae3563c5caae96cbeee5 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1526,18 +1526,18 @@ Allowed extensions: {', '|implode:$attachmentHandler->getFormattedAllowedExtensi
                <item name="wcf.date.month.october"><![CDATA[October]]></item>
                <item name="wcf.date.month.november"><![CDATA[November]]></item>
                <item name="wcf.date.month.december"><![CDATA[December]]></item>
-               <item name="wcf.date.month.jan"><![CDATA[Jan]]></item>
-               <item name="wcf.date.month.feb"><![CDATA[Feb]]></item>
-               <item name="wcf.date.month.mar"><![CDATA[Mar]]></item>
-               <item name="wcf.date.month.apr"><![CDATA[Apr]]></item>
-               <item name="wcf.date.month.may"><![CDATA[May]]></item>
-               <item name="wcf.date.month.jun"><![CDATA[Jun]]></item>
-               <item name="wcf.date.month.jul"><![CDATA[Jul]]></item>
-               <item name="wcf.date.month.aug"><![CDATA[Aug]]></item>
-               <item name="wcf.date.month.sep"><![CDATA[Sep]]></item>
-               <item name="wcf.date.month.oct"><![CDATA[Oct]]></item>
-               <item name="wcf.date.month.nov"><![CDATA[Nov]]></item>
-               <item name="wcf.date.month.dec"><![CDATA[Dec]]></item>
+               <item name="wcf.date.month.short.jan"><![CDATA[Jan]]></item>
+               <item name="wcf.date.month.short.feb"><![CDATA[Feb]]></item>
+               <item name="wcf.date.month.short.mar"><![CDATA[Mar]]></item>
+               <item name="wcf.date.month.short.apr"><![CDATA[Apr]]></item>
+               <item name="wcf.date.month.short.may"><![CDATA[May]]></item>
+               <item name="wcf.date.month.short.jun"><![CDATA[Jun]]></item>
+               <item name="wcf.date.month.short.jul"><![CDATA[Jul]]></item>
+               <item name="wcf.date.month.short.aug"><![CDATA[Aug]]></item>
+               <item name="wcf.date.month.short.sep"><![CDATA[Sep]]></item>
+               <item name="wcf.date.month.short.oct"><![CDATA[Oct]]></item>
+               <item name="wcf.date.month.short.nov"><![CDATA[Nov]]></item>
+               <item name="wcf.date.month.short.dec"><![CDATA[Dec]]></item>
                <item name="wcf.date.day.sun"><![CDATA[Sun]]></item>
                <item name="wcf.date.day.mon"><![CDATA[Mon]]></item>
                <item name="wcf.date.day.tue"><![CDATA[Tue]]></item>