From 3b35c6e47cbb998659c302dcf2594c34e340574c Mon Sep 17 00:00:00 2001 From: David Schneiderbauer Date: Thu, 24 May 2018 20:07:02 +0200 Subject: [PATCH] add i18n section in config cheat sheet, reordered app.ini.sample (#4038) * add i18n section in config cheat sheet, reordered app.ini.sample * fix wrong default config --- custom/conf/app.ini.sample | 17 +++++------ .../doc/advanced/config-cheat-sheet.en-us.md | 30 +++++++++++++++++++ 2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/custom/conf/app.ini.sample b/custom/conf/app.ini.sample index aad6e9c762..8392576da2 100644 --- a/custom/conf/app.ini.sample +++ b/custom/conf/app.ini.sample @@ -571,19 +571,11 @@ MAX_RESPONSE_ITEMS = 50 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,한국어 -[U2F] -; Two Factor authentication with security keys -; https://developers.yubico.com/U2F/App_ID.html -APP_ID = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s -; Comma seperated list of truisted facets -TRUSTED_FACETS = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s - - ; Used for datetimepicker [i18n.datelang] en-US = en zh-CN = zh -zh-HK = zh-TW +zh-HK = zh-HK zh-TW = zh-TW de-DE = de fr-FR = fr @@ -604,6 +596,13 @@ sr-SP = sr sv-SE = sv ko-KR = ko +[U2F] +; Two Factor authentication with security keys +; https://developers.yubico.com/U2F/App_ID.html +APP_ID = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s +; Comma seperated list of truisted facets +TRUSTED_FACETS = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s + ; Extension mapping to highlight class ; e.g. .toml=ini [highlight.mapping] 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 0d2af62373..b697e5c235 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md +++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md @@ -278,6 +278,36 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`. - `MAX_GIT_DIFF_FILES`: **100**: Max number of files shown in diff view. - `GC_ARGS`: **\**: Arguments for command `git gc`, e.g. `--aggressive --auto`. +## 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 + +### i18n - Datepicker Language (`i18n.datelang`) +Maps locales to the languages used by the datepicker plugin + +- `en-US`: **en** +- `zh-CN`: **zh** +- `zh-HK`: **zh-HK** +- `zh-TW`: **zh-TW** +- `de-DE`: **de** +- `fr-FR`: **fr** +- `nl-NL`: **nl** +- `lv-LV`: **lv** +- `ru-RU`: **ru** +- `ja-JP`: **ja** +- `es-ES`: **es** +- `pt-BR`: **pt-BR** +- `pl-PL`: **pl** +- `bg-BG`: **bg** +- `it-IT`: **it** +- `fi-FI`: **fi** +- `tr-TR`: **tr** +- `cs-CZ`: **cs-CZ** +- `sr-SP`: **sr** +- `sv-SE`: **sv** +- `ko-KR`: **ko** + ## U2F (`U2F`) - `APP_ID`: **`ROOT_URL`**: Declares the facet of the application. Requires HTTPS. - `TRUSTED_FACETS`: List of additional facets which are trusted. This is not support by all browsers.