From caa96d4fa452026cbf6815f73df6c4e59951d1d1 Mon Sep 17 00:00:00 2001 From: Diego Najar Date: Sun, 10 Sep 2017 14:56:23 +0200 Subject: [PATCH] Updated language dictionaries and minor changes on CSS --- bl-kernel/boot/rules/99.themes.php | 4 ++-- bl-kernel/dbsite.class.php | 2 +- bl-themes/docs/languages/{en_US.json => en.json} | 0 bl-themes/editorial/languages/{en_US.json => en.json} | 0 bl-themes/kernel-panic/languages/{en_US.json => en.json} | 0 bl-themes/klean/languages/{en_US.json => en.json} | 0 bl-themes/klean/languages/{es_AR.json => es.json} | 0 bl-themes/lingonberry/languages/{en_US.json => en.json} | 0 bl-themes/log/languages/{en_US.json => en.json} | 0 bl-themes/log/languages/es_AR.json | 7 ------- bl-themes/log/languages/nl_NL.json | 7 ------- bl-themes/massively/languages/{en_US.json => en.json} | 0 bl-themes/micro/languages/{en_US.json => en.json} | 0 13 files changed, 3 insertions(+), 17 deletions(-) rename bl-themes/docs/languages/{en_US.json => en.json} (100%) rename bl-themes/editorial/languages/{en_US.json => en.json} (100%) rename bl-themes/kernel-panic/languages/{en_US.json => en.json} (100%) rename bl-themes/klean/languages/{en_US.json => en.json} (100%) rename bl-themes/klean/languages/{es_AR.json => es.json} (100%) rename bl-themes/lingonberry/languages/{en_US.json => en.json} (100%) rename bl-themes/log/languages/{en_US.json => en.json} (100%) delete mode 100644 bl-themes/log/languages/es_AR.json delete mode 100644 bl-themes/log/languages/nl_NL.json rename bl-themes/massively/languages/{en_US.json => en.json} (100%) rename bl-themes/micro/languages/{en_US.json => en.json} (100%) diff --git a/bl-kernel/boot/rules/99.themes.php b/bl-kernel/boot/rules/99.themes.php index 3751f04a..91ec6a49 100644 --- a/bl-kernel/boot/rules/99.themes.php +++ b/bl-kernel/boot/rules/99.themes.php @@ -20,7 +20,7 @@ function buildThemes() // Check if the theme is translated. $languageFilename = $themePath.DS.'languages'.DS.$Site->locale().'.json'; if( !Sanitize::pathFile($languageFilename) ) { - $languageFilename = $themePath.DS.'languages'.DS.'en_US.json'; + $languageFilename = $themePath.DS.'languages'.DS.DEFAULT_LANGUAGE_FILE; } if( Sanitize::pathFile($languageFilename) ) @@ -72,7 +72,7 @@ function buildThemes() // Load the language file $languageFilename = THEME_DIR.'languages'.DS.$Site->locale().'.json'; if( !Sanitize::pathFile($languageFilename) ) { - $languageFilename = THEME_DIR.'languages'.DS.'en_US.json'; + $languageFilename = THEME_DIR.'languages'.DS.DEFAULT_LANGUAGE_FILE; } if( Sanitize::pathFile($languageFilename) ) diff --git a/bl-kernel/dbsite.class.php b/bl-kernel/dbsite.class.php index 9b1639b6..51be3195 100644 --- a/bl-kernel/dbsite.class.php +++ b/bl-kernel/dbsite.class.php @@ -9,7 +9,7 @@ class dbSite extends dbJSON 'footer'=> array('inFile'=>false, 'value'=>'I wanna be a pirate!'), 'itemsPerPage'=> array('inFile'=>false, 'value'=>6), 'language'=> array('inFile'=>false, 'value'=>'en'), - 'locale'=> array('inFile'=>false, 'value'=>'en_US'), + 'locale'=> array('inFile'=>false, 'value'=>'en, en_US, en_AU, en_CA, en_GB, en_IE, en_NZ'), 'timezone'=> array('inFile'=>false, 'value'=>'America/Argentina/Buenos_Aires'), 'theme'=> array('inFile'=>false, 'value'=>'pure'), 'adminTheme'=> array('inFile'=>false, 'value'=>'default'), diff --git a/bl-themes/docs/languages/en_US.json b/bl-themes/docs/languages/en.json similarity index 100% rename from bl-themes/docs/languages/en_US.json rename to bl-themes/docs/languages/en.json diff --git a/bl-themes/editorial/languages/en_US.json b/bl-themes/editorial/languages/en.json similarity index 100% rename from bl-themes/editorial/languages/en_US.json rename to bl-themes/editorial/languages/en.json diff --git a/bl-themes/kernel-panic/languages/en_US.json b/bl-themes/kernel-panic/languages/en.json similarity index 100% rename from bl-themes/kernel-panic/languages/en_US.json rename to bl-themes/kernel-panic/languages/en.json diff --git a/bl-themes/klean/languages/en_US.json b/bl-themes/klean/languages/en.json similarity index 100% rename from bl-themes/klean/languages/en_US.json rename to bl-themes/klean/languages/en.json diff --git a/bl-themes/klean/languages/es_AR.json b/bl-themes/klean/languages/es.json similarity index 100% rename from bl-themes/klean/languages/es_AR.json rename to bl-themes/klean/languages/es.json diff --git a/bl-themes/lingonberry/languages/en_US.json b/bl-themes/lingonberry/languages/en.json similarity index 100% rename from bl-themes/lingonberry/languages/en_US.json rename to bl-themes/lingonberry/languages/en.json diff --git a/bl-themes/log/languages/en_US.json b/bl-themes/log/languages/en.json similarity index 100% rename from bl-themes/log/languages/en_US.json rename to bl-themes/log/languages/en.json diff --git a/bl-themes/log/languages/es_AR.json b/bl-themes/log/languages/es_AR.json deleted file mode 100644 index 3ea08c41..00000000 --- a/bl-themes/log/languages/es_AR.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "theme-data": - { - "name": "Log", - "description": "Minimalista y a su vez altamente adaptable para todo tipo de pantallas, desarrollado por @n33co, adaptado y modificado para Bludit." - } -} \ No newline at end of file diff --git a/bl-themes/log/languages/nl_NL.json b/bl-themes/log/languages/nl_NL.json deleted file mode 100644 index bd14f1c3..00000000 --- a/bl-themes/log/languages/nl_NL.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "theme-data": - { - "name": "Log", - "description": "Minimalistisch en responsive thema, ontwikkeld door @n33, aangepast voor Bludit." - } -} diff --git a/bl-themes/massively/languages/en_US.json b/bl-themes/massively/languages/en.json similarity index 100% rename from bl-themes/massively/languages/en_US.json rename to bl-themes/massively/languages/en.json diff --git a/bl-themes/micro/languages/en_US.json b/bl-themes/micro/languages/en.json similarity index 100% rename from bl-themes/micro/languages/en_US.json rename to bl-themes/micro/languages/en.json