From 5cb540c48179d85786830aa60f73ce19fddf256e Mon Sep 17 00:00:00 2001 From: Will Date: Thu, 19 Jul 2018 08:34:26 +0200 Subject: [PATCH] fix language list Standardized the languages' names within the list displayed when picking up a language at the bottom of the webpages --- custom/conf/app.ini.sample | 2 +- docs/content/doc/advanced/config-cheat-sheet.en-us.md | 2 +- modules/setting/defaults.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/custom/conf/app.ini.sample b/custom/conf/app.ini.sample index f087e9913..a4e77a381 100644 --- a/custom/conf/app.ini.sample +++ b/custom/conf/app.ini.sample @@ -586,7 +586,7 @@ MAX_RESPONSE_ITEMS = 50 [i18n] LANGS = en-US,zh-CN,zh-HK,zh-TW,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,uk-UA,ja-JP,es-ES,pt-BR,pl-PL,bg-BG,it-IT,fi-FI,tr-TR,cs-CZ,sr-SP,sv-SE,ko-KR -NAMES = English,简体中文,繁體中文（香港）,繁體中文（台灣）,Deutsch,français,Nederlands,latviešu,русский,Українська,日本語,español,português do Brasil,polski,български,italiano,suomi,Türkçe,čeština,српски,svenska,한국어 +NAMES = English,简体中文,繁體中文（香港）,繁體中文（台灣）,Deutsch,Français,Nederlands,Latviešu,Pусский,Українська,日本語,Español,Português do Brasil,Polski,български,Italiano,Suomi,Türkçe,Čeština,Cрпски,Svenska,한국어 ; Used for datetimepicker [i18n.datelang] diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md index 5ed2ce43e..b813ee34b 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md +++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md @@ -299,7 +299,7 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`. ## i18n (`i18n`) - `LANGS`: **en-US,zh-CN,zh-HK,zh-TW,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,ja-JP,es-ES,pt-BR,pl-PL,bg-BG,it-IT,fi-FI,tr-TR,cs-CZ,sr-SP,sv-SE,ko-KR**: List of locales shown in language selector -- `NAMES`: **English,简体中文,繁體中文（香港）,繁體中文（台灣）,Deutsch,français,Nederlands,latviešu,русский,日本語,español,português do Brasil,polski,български,italiano,suomi,Türkçe,čeština,српски,svenska,한국어**: Visible names corresponding to the locales +- `NAMES`: **English,简体中文,繁體中文（香港）,繁體中文（台灣）,Deutsch,Français,Nederlands,Latviešu,Pусский,日本語,Español,Português do Brasil,Polski,български,Italiano,Suomi,Türkçe,Čeština,Cрпски,Svenska,한국어**: Visible names corresponding to the locales ### i18n - Datepicker Language (`i18n.datelang`) Maps locales to the languages used by the datepicker plugin diff --git a/modules/setting/defaults.go b/modules/setting/defaults.go index 527a6af3b..b07bb5a1a 100644 --- a/modules/setting/defaults.go +++ b/modules/setting/defaults.go @@ -6,5 +6,5 @@ import ( var ( defaultLangs = strings.Split("en-US,zh-CN,zh-HK,zh-TW,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,uk-UA,ja-JP,es-ES,pt-BR,pl-PL,bg-BG,it-IT,fi-FI,tr-TR,cs-CZ,sr-SP,sv-SE,ko-KR", ",") - defaultLangNames = strings.Split("English,简体中文,繁體中文（香港）,繁體中文（台灣）,Deutsch,français,Nederlands,latviešu,русский,Українська,日本語,español,português do Brasil,polski,български,italiano,suomi,Türkçe,čeština,српски,svenska,한국어", ",") + defaultLangNames = strings.Split("English,简体中文,繁體中文（香港）,繁體中文（台灣）,Deutsch,Français,Nederlands,Latviešu,Pусский,Українська,日本語,Español,Português do Brasil,Polski,български,Italiano,Suomi,Türkçe,Čeština,Cрпски,Svenska,한국어", ",") )