Browse Source

Simplify the language

For better flexibility
pull/405/merge
danpros 4 years ago
parent
commit
0f28fe7343
12 changed files with 6 additions and 18 deletions
  1. +2
    -2
      config/config.ini.example
  2. +0
    -0
      lang/de_DE.ini
  3. +0
    -0
      lang/en_US.ini
  4. +0
    -0
      lang/es_ES.ini
  5. +0
    -0
      lang/fr_FR.ini
  6. +0
    -0
      lang/it_IT.ini
  7. +0
    -0
      lang/pl_PL.ini
  8. +0
    -0
      lang/ru_RU.ini
  9. +0
    -0
      lang/sv_SE.ini
  10. +0
    -0
      lang/tr_TR.ini
  11. +0
    -0
      lang/zh_TW.ini
  12. +4
    -16
      system/includes/functions.php

+ 2
- 2
config/config.ini.example View File

@ -7,8 +7,8 @@ timezone = "Asia/Jakarta"
; Date format. See: https://www.php.net/manual/en/function.strftime ; Date format. See: https://www.php.net/manual/en/function.strftime
date.format = "%d %B %Y" date.format = "%d %B %Y"
; Your language (currently only "en" for English or "de" for German)
language = "en"
; Your language (example "en_US" for English or "de_DE" for German. See lang directory for available language)
language = "en_US"
; Blog info ; Blog info
blog.title = "HTMLy" blog.title = "HTMLy"


lang/de.ini → lang/de_DE.ini View File


lang/en.ini → lang/en_US.ini View File


lang/es.ini → lang/es_ES.ini View File


lang/fr.ini → lang/fr_FR.ini View File


lang/it.ini → lang/it_IT.ini View File


lang/pl.ini → lang/pl_PL.ini View File


lang/ru.ini → lang/ru_RU.ini View File


lang/sv.ini → lang/sv_SE.ini View File


lang/tr.ini → lang/tr_TR.ini View File


lang/zh-tw.ini → lang/zh_TW.ini View File


+ 4
- 16
system/includes/functions.php View File

@ -3216,24 +3216,12 @@ function get_language()
$local = $langID; $local = $langID;
// Settings for the language // Settings for the language
if (!isset($langID) || config('language') === 'en' || !file_exists($langFile)) {
if (!isset($langID) || config('language') === 'en') {
i18n('source', 'lang/en.ini'); // Load the English language file
setlocale(LC_ALL, 'en_US', 'en_US.utf8', 'English'); // Change locale to English
if (!isset($langID) || config('language') === 'en' || config('language') === 'en_US' || !file_exists($langFile)) {
i18n('source', 'lang/en_US.ini'); // Load the English language file
setlocale(LC_ALL, 'en_US.utf8'); // Change locale to English
} else { } else {
i18n('source', $langFile); i18n('source', $langFile);
// Locales are known under different names on different systems; I don't know any other way
// to handle this than to add a list of locale names for each language.
if ($langID === 'de') {
setlocale(LC_ALL, 'de_DE', 'de_DE.utf8', 'German');
}
elseif ($langID === 'sv') {
setlocale(LC_ALL, 'sv_SE', 'sv_SE.utf8', 'Swedish');
}
elseif ($langID === 'pl') {
setlocale(LC_ALL, 'pl_PL', 'pl_PL.utf8', 'Polish');
}
setlocale(LC_ALL, $local . '.utf8');
} }
} }


Loading…
Cancel
Save