From: jenkins-bot Date: Fri, 30 Nov 2018 19:39:05 +0000 (+0000) Subject: Merge "Special:Preferences: Add example value as placeholder to timezone offset" X-Git-Tag: 1.34.0-rc.0~3402 X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=2452bc3c492832c344ec123970739bbd5dcc3e65;hp=85fa38d0b71cae9a3065105b39d8c36dc6517285;p=lhc%2Fweb%2Fwiklou.git Merge "Special:Preferences: Add example value as placeholder to timezone offset" --- diff --git a/includes/preferences/DefaultPreferencesFactory.php b/includes/preferences/DefaultPreferencesFactory.php index 32a54044fa..769954d9b9 100644 --- a/includes/preferences/DefaultPreferencesFactory.php +++ b/includes/preferences/DefaultPreferencesFactory.php @@ -796,6 +796,7 @@ class DefaultPreferencesFactory implements PreferencesFactory { 'section' => 'rendering/timeoffset', 'id' => 'wpTimeCorrection', 'filter' => TimezoneFilter::class, + 'placeholder-message' => 'timezone-useoffset-placeholder', ]; } diff --git a/languages/i18n/en.json b/languages/i18n/en.json index b2a755dbcd..dd94787091 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -1078,7 +1078,8 @@ "timezonelegend": "Time zone:", "localtime": "Local time:", "timezoneuseserverdefault": "Use wiki default ($1)", - "timezoneuseoffset": "Other (specify offset)", + "timezoneuseoffset": "Other (specify offset below)", + "timezone-useoffset-placeholder": "Example values: \"-07:00\" or \"01:00\"", "servertime": "Server time:", "guesstimezone": "Fill in from browser", "timezoneregion-africa": "Africa", diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json index 26fed9465f..393e920483 100644 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@ -1282,6 +1282,7 @@ "localtime": "Used as label in [[Special:Preferences#mw-prefsection-datetime|preferences]].", "timezoneuseserverdefault": "[[Special:Preferences]] > Date and time > Time zone\n\nThis option lets your time zone setting use the one that is used on the wiki (often UTC).\n\nParameters:\n* $1 - timezone name, or timezone offset (in \"%+03d:%02d\" format)", "timezoneuseoffset": "Used in \"Time zone\" listbox in [[Special:Preferences#mw-prefsection-datetime|preferences]], \"date and time\" tab.", + "timezone-useoffset-placeholder": "Used in \"Time zone\" text input field as placeholder in [[Special:Preferences#mw-prefsection-datetime|preferences]]", "servertime": "Used as label in [[Special:Preferences#mw-prefsection-datetime|preferences]].", "guesstimezone": "Option to fill in the timezone from the browser setting", "timezoneregion-africa": "Used in \"Time zone\" listbox in [[Special:Preferences#mw-prefsection-datetime|preferences]], \"date and time\" tab.\n{{Related|Timezoneregion}}",