From 1e6f0bc8fdc5b2728a96a654942ee8faa26b49f6 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Sun, 24 Jan 2016 13:35:02 +0100 Subject: [PATCH] Using __literal=true instead --- com.woltlab.wcf/templates/headIncludeJavaScript.tpl | 8 ++++---- wcfsetup/install/files/acp/templates/header.tpl | 8 ++++---- wcfsetup/install/lang/de.xml | 9 +-------- wcfsetup/install/lang/en.xml | 9 +-------- 4 files changed, 10 insertions(+), 24 deletions(-) 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: - + 1}{#$minutes} Minuten{else}einer Minute{/if}]]> 1}{#$hours} Stunden{else}einer Stunde{/if}]]> 1}{$day}{else}Gestern{/if}, {$time}]]> - - - - 1}{#$minutes} Minuten{else}einer Minute{/if}{/literal}]]> - 1}{#$hours} Stunden{else}einer Stunde{/if}{/literal}]]> - 1}{$day}{else}Gestern{/if}, {$time}{/literal}]]> - 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: - + 1}{#$minutes} minutes{else}A minute{/if} ago]]> 1}{#$hours} hours{else}An hour{/if} ago]]> 1}{$day}{else}Yesterday{/if}, {$time}]]> - - - - 1}{#$minutes} minutes{else}A minute{/if} ago{/literal}]]> - 1}{#$hours} hours{else}An hour{/if} ago{/literal}]]> - 1}{$day}{else}Yesterday{/if}, {$time}{/literal}]]> - -- 2.20.1