diff options
| author | Christian Schmidt <github@chsc.dk> | 2018-06-08 01:50:53 +0300 |
|---|---|---|
| committer | diosmosis <diosmosis@users.noreply.github.com> | 2018-06-08 01:50:53 +0300 |
| commit | 3bb70547569d02d07db038f42b6b07be9de6d4e4 (patch) | |
| tree | fea0f40a080770a4b204ae2dec8dcf9ba9d6c396 /plugins/SitesManager/templates | |
| parent | 5076bd6bfdc32b969f122a5ef65c02fb1ab3c5b2 (diff) | |
Translate timezone names (#12901)
* Translate timezone names
* Add translations
* Remove unnecessary help text
* Wrap less code in try/catch
* Always populate timezone_name
* Use "UTC" instead of "GMT" from CLDR
* Update screenshot
Diffstat (limited to 'plugins/SitesManager/templates')
| -rw-r--r-- | plugins/SitesManager/templates/help/timezone-help.html | 11 | ||||
| -rw-r--r-- | plugins/SitesManager/templates/sites-list/site-fields.html | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/plugins/SitesManager/templates/help/timezone-help.html b/plugins/SitesManager/templates/help/timezone-help.html index 393606f147..f834b7ff15 100644 --- a/plugins/SitesManager/templates/help/timezone-help.html +++ b/plugins/SitesManager/templates/help/timezone-help.html @@ -1,14 +1,9 @@ <div> - <span ng-switch="timezoneSupportEnabled"> - <span ng-switch-default> - {{ 'SitesManager_AdvancedTimezoneSupportNotFound'|translate }} - </span> - <span ng-switch-when="true"> - {{ 'SitesManager_ChooseCityInSameTimezoneAsYou'|translate }} - </span> + <span ng-if="!timezoneSupportEnabled"> + {{ 'SitesManager_AdvancedTimezoneSupportNotFound'|translate }} + <br/> </span> - <br/> {{ 'SitesManager_UTCTimeIs'| translate : (utcTime | date : 'yyyy-MM-dd HH:mm:ss') }} <br/> {{ 'SitesManager_ChangingYourTimezoneWillOnlyAffectDataForward'|translate }} diff --git a/plugins/SitesManager/templates/sites-list/site-fields.html b/plugins/SitesManager/templates/sites-list/site-fields.html index 35fdf55766..250ae93e08 100644 --- a/plugins/SitesManager/templates/sites-list/site-fields.html +++ b/plugins/SitesManager/templates/sites-list/site-fields.html @@ -18,7 +18,7 @@ </div> <div class="col m4"> <ul> - <li><span class="title">{{ 'SitesManager_Timezone'|translate }}:</span> {{ site.timezone }}</li> + <li><span class="title">{{ 'SitesManager_Timezone'|translate }}:</span> {{ site.timezone_name }}</li> <li><span class="title">{{ 'SitesManager_Currency'|translate }}:</span> {{ site.currency }}</li> <li ng-show="site.ecommerce == 1"> <span class="title">{{ 'Goals_Ecommerce'|translate }}:</span> {{ 'General_Yes'|translate }} |