From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 24 Jan 2016 12:35:02 +0000 (+0100)
Subject: Using  __literal=true instead
X-Git-Tag: 3.0.0_Beta_1~2030^2~133
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1e6f0bc8fdc5b2728a96a654942ee8faa26b49f6;p=GitHub%2FWoltLab%2FWCF.git

Using  __literal=true instead
---

diff --git a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
index e414fd2b45..80dd468a0f 100644
--- a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
+++ b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
@@ -28,10 +28,10 @@ requirejs.config({
 			'__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.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.nowJS{/lang}',
-			'wcf.date.relative.minutes': '{capture assign=relativeMinutes}{lang}wcf.date.relative.minutesJS{/lang}{/capture}{@$relativeMinutes|encodeJS}',
-			'wcf.date.relative.hours': '{capture assign=relativeHours}{lang}wcf.date.relative.hoursJS{/lang}{/capture}{@$relativeHours|encodeJS}',
-			'wcf.date.relative.pastDays': '{capture assign=relativePastDays}{lang}wcf.date.relative.pastDaysJS{/lang}{/capture}{@$relativePastDays|encodeJS}',
+			'wcf.date.relative.now': '{lang __literal=true}wcf.date.relative.now{/lang}',
+			'wcf.date.relative.minutes': '{capture assign=relativeMinutes}{lang __literal=true}wcf.date.relative.minutes{/lang}{/capture}{@$relativeMinutes|encodeJS}',
+			'wcf.date.relative.hours': '{capture assign=relativeHours}{lang __literal=true}wcf.date.relative.hours{/lang}{/capture}{@$relativeHours|encodeJS}',
+			'wcf.date.relative.pastDays': '{capture assign=relativePastDays}{lang __literal=true}wcf.date.relative.pastDays{/lang}{/capture}{@$relativePastDays|encodeJS}',
 			'wcf.date.dateFormat': '{lang}wcf.date.dateFormat{/lang}',
 			'wcf.date.dateTimeFormat': '{lang}wcf.date.dateTimeFormat{/lang}',
 			'wcf.date.shortDateTimeFormat': '{lang}wcf.date.shortDateTimeFormat{/lang}',
diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index e64c7f108e..679b63f051 100644
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -43,10 +43,10 @@
 				'__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.nowJS{/lang}',
-				'wcf.date.relative.minutes': '{capture assign=relativeMinutes}{lang}wcf.date.relative.minutesJS{/lang}{/capture}{@$relativeMinutes|encodeJS}',
-				'wcf.date.relative.hours': '{capture assign=relativeHours}{lang}wcf.date.relative.hoursJS{/lang}{/capture}{@$relativeHours|encodeJS}',
-				'wcf.date.relative.pastDays': '{capture assign=relativePastDays}{lang}wcf.date.relative.pastDaysJS{/lang}{/capture}{@$relativePastDays|encodeJS}',
+				'wcf.date.relative.now': '{lang __literal=true}wcf.date.relative.now{/lang}',
+				'wcf.date.relative.minutes': '{capture assign=relativeMinutes}{lang __literal=true}wcf.date.relative.minutes{/lang}{/capture}{@$relativeMinutes|encodeJS}',
+				'wcf.date.relative.hours': '{capture assign=relativeHours}{lang __literal=true}wcf.date.relative.hours{/lang}{/capture}{@$relativeHours|encodeJS}',
+				'wcf.date.relative.pastDays': '{capture assign=relativePastDays}{lang __literal=true}wcf.date.relative.pastDays{/lang}{/capture}{@$relativePastDays|encodeJS}',
 				'wcf.date.dateFormat': '{lang}wcf.date.dateFormat{/lang}',
 				'wcf.date.dateTimeFormat': '{lang}wcf.date.dateTimeFormat{/lang}',
 				'wcf.date.shortDateTimeFormat': '{lang}wcf.date.shortDateTimeFormat{/lang}',
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 0da212645d..a5e3191cbb 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -2017,19 +2017,12 @@ Fehler sind beispielsweise:
 		<item name="wcf.date.period.today"><![CDATA[Heute]]></item>
 		<item name="wcf.date.period.yesterday"><![CDATA[Gestern]]></item>
 		
-		<!-- variables for relative datetime for use in PHP -->
+		<!-- variables for relative datetime -->
 		<item name="wcf.date.relative.now"><![CDATA[Vor einem Moment]]></item>
 		<item name="wcf.date.relative.minutes"><![CDATA[Vor {if $minutes > 1}{#$minutes} Minuten{else}einer Minute{/if}]]></item>
 		<item name="wcf.date.relative.hours"><![CDATA[Vor {if $hours > 1}{#$hours} Stunden{else}einer Stunde{/if}]]></item>
 		<item name="wcf.date.relative.pastDays"><![CDATA[{if $days > 1}{$day}{else}Gestern{/if}, {$time}]]></item>
 		
-		<!-- variables for relative datetime for use in JavaScript -->
-		<!-- should match the variables above but wrapped in {literal}…{/literal} -->
-		<item name="wcf.date.relative.nowJS"><![CDATA[Vor einem Moment]]></item>
-		<item name="wcf.date.relative.minutesJS"><![CDATA[{literal}Vor {if $minutes > 1}{#$minutes} Minuten{else}einer Minute{/if}{/literal}]]></item>
-		<item name="wcf.date.relative.hoursJS"><![CDATA[{literal}Vor {if $hours > 1}{#$hours} Stunden{else}einer Stunde{/if}{/literal}]]></item>
-		<item name="wcf.date.relative.pastDaysJS"><![CDATA[{literal}{if $days > 1}{$day}{else}Gestern{/if}, {$time}{/literal}]]></item>
-		
 		<!-- variables for localized date formats -->
 		<item name="wcf.date.hour"><![CDATA[Stunde]]></item>
 		<item name="wcf.date.minute"><![CDATA[Minute]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index b55633f52c..7db8a801c4 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2020,19 +2020,12 @@ Errors are:
 		<item name="wcf.date.period.today"><![CDATA[Today]]></item>
 		<item name="wcf.date.period.yesterday"><![CDATA[Yesterday]]></item>
 		
-		<!-- variables for relative datetime for use in PHP -->
+		<!-- variables for relative datetime -->
 		<item name="wcf.date.relative.now"><![CDATA[A moment ago]]></item>
 		<item name="wcf.date.relative.minutes"><![CDATA[{if $minutes > 1}{#$minutes} minutes{else}A minute{/if} ago]]></item>
 		<item name="wcf.date.relative.hours"><![CDATA[{if $hours > 1}{#$hours} hours{else}An hour{/if} ago]]></item>
 		<item name="wcf.date.relative.pastDays"><![CDATA[{if $days > 1}{$day}{else}Yesterday{/if}, {$time}]]></item>
 		
-		<!-- variables for relative datetime for use in JavaScript -->
-		<!-- should match the variables above but wrapped in {literal}…{/literal} -->
-		<item name="wcf.date.relative.now"><![CDATA[A moment ago]]></item>
-		<item name="wcf.date.relative.minutes"><![CDATA[{literal}{if $minutes > 1}{#$minutes} minutes{else}A minute{/if} ago{/literal}]]></item>
-		<item name="wcf.date.relative.hours"><![CDATA[{literal}{if $hours > 1}{#$hours} hours{else}An hour{/if} ago{/literal}]]></item>
-		<item name="wcf.date.relative.pastDays"><![CDATA[{literal}{if $days > 1}{$day}{else}Yesterday{/if}, {$time}{/literal}]]></item>
-		
 		<!-- variables for localized date formats -->
 		<item name="wcf.date.hour"><![CDATA[Hour]]></item>
 		<item name="wcf.date.minute"><![CDATA[Minute]]></item>