From 144e98d5ac29d0444060a32afce6dd47d4d42982 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Klockiewicz?= Date: Sun, 27 May 2018 17:26:59 +0200 Subject: [PATCH] Language management function --- inc/core/BaseModule.php | 17 ++- inc/modules/langswitcher/Info.php | 4 +- inc/modules/langswitcher/Site.php | 4 +- inc/modules/settings/Admin.php | 56 +++++++- inc/modules/settings/Info.php | 6 +- .../settings/lang/admin/en_english.ini | 131 +++++++++--------- .../settings/lang/admin/es_spanish.ini | 127 +++++++++-------- inc/modules/settings/lang/admin/fr_french.ini | 127 +++++++++-------- .../settings/lang/admin/it_italian.ini | 7 + inc/modules/settings/lang/admin/nl_dutch.ini | 131 +++++++++--------- inc/modules/settings/lang/admin/pl_polski.ini | 7 + .../settings/lang/admin/ru_russian.ini | 9 +- .../settings/lang/admin/se_swedish.ini | 45 +++--- .../settings/lang/admin/tr_turkish.ini | 9 +- .../settings/view/admin/translation.html | 20 ++- 15 files changed, 420 insertions(+), 280 deletions(-) diff --git a/inc/core/BaseModule.php b/inc/core/BaseModule.php index 94b98f3..ebffb9a 100644 --- a/inc/core/BaseModule.php +++ b/inc/core/BaseModule.php @@ -95,21 +95,30 @@ class BaseModule /** * Languages list * @param string $selected - * @param string $active ('active' or 'selected') + * @param string $currentAttr ('active' or 'selected') * @return array */ - protected function _getLanguages($selected = null, $active = 'active') + protected function _getLanguages($selected = null, $currentAttr = 'active', $all = false) { $langs = glob(BASE_DIR.'/inc/lang/*', GLOB_ONLYDIR); $result = []; foreach ($langs as $lang) { + if (file_exists($lang.'/.lock')) { + $active = false; + + if (!$all) { + continue; + } + } else { + $active = true; + } if ($selected == basename($lang)) { - $attr = $active; + $attr = $currentAttr; } else { $attr = null; } - $result[] = ['name' => basename($lang), 'attr' => $attr]; + $result[] = ['name' => basename($lang), 'attr' => $attr, 'active' => $active]; } return $result; } diff --git a/inc/modules/langswitcher/Info.php b/inc/modules/langswitcher/Info.php index 9ecfe8c..ac03cd0 100644 --- a/inc/modules/langswitcher/Info.php +++ b/inc/modules/langswitcher/Info.php @@ -13,8 +13,8 @@ return [ 'name' => $core->lang['langswitcher']['module_name'], 'description' => $core->lang['langswitcher']['module_desc'], 'author' => 'Sruu.pl', - 'version' => '1.1', - 'compatibility' => '1.3.*', + 'version' => '1.2', + 'compatibility' => '1.3.*', 'icon' => 'flag', 'install' => function () use ($core) { $core->db()->pdo()->exec("INSERT INTO `settings` (`module`, `field`, `value`) VALUES ('settings', 'autodetectlang', 0)"); diff --git a/inc/modules/langswitcher/Site.php b/inc/modules/langswitcher/Site.php index f33baf6..7973803 100644 --- a/inc/modules/langswitcher/Site.php +++ b/inc/modules/langswitcher/Site.php @@ -66,8 +66,10 @@ class Site extends SiteModule $result = []; foreach ($langs as $lang) { + if (file_exists($lang.'/.lock')) { + continue; + } $lang = basename($lang); - $result[] = [ 'dir' => $lang, 'name' => mb_strtoupper(preg_replace('/_[a-z]+/', null, $lang)), diff --git a/inc/modules/settings/Admin.php b/inc/modules/settings/Admin.php index 57832d4..b5e1585 100644 --- a/inc/modules/settings/Admin.php +++ b/inc/modules/settings/Admin.php @@ -238,8 +238,11 @@ class Admin extends AdminModule $_GET['source'] = 0; } - $settings['langs'] = $this->_getLanguages($_GET['lang']); - $settings['selected'] = $_GET['lang']; + $settings = [ + 'langs' => $this->_getLanguages($_GET['lang']), + 'langs_all' => $this->_getLanguages($_GET['lang'], 'active', true), + 'selected' => $_GET['lang'], + ]; $translations = $this->_getAllTranslations($_GET['lang']); $translation = $translations[$_GET['source']]; @@ -403,6 +406,55 @@ class Admin extends AdminModule redirect(url([ADMIN, 'settings', 'translation?lang='.$_GET['lang']])); } + /** + * remove language from server + */ + public function getDeleteLanguage($name) + { + if (($this->settings('settings', 'lang_site') == $name) || ($this->settings('settings', 'lang_admin') == $name)) { + $this->notify('failure', $this->lang('lang_delete_failure')); + } + else { + if (deleteDir(BASE_DIR.'/inc/lang/'.$name)) { + $this->notify('success', $this->lang('lang_delete_success')); + } + } + + redirect(url([ADMIN, 'settings', 'translation'])); + } + + /** + * activate language + */ + public function getActivateLanguage($name) + { + if (unlink(BASE_DIR.'/inc/lang/'.$name.'/.lock')) { + $this->notify('success', $this->lang('lang_activate_success')); + } else { + $this->notify('failure', $this->lang('lang_activate_failure')); + } + + redirect(url([ADMIN, 'settings', 'translation'])); + } + + /** + * deactivate language + */ + public function getDeactivateLanguage($name) + { + if (($this->settings('settings', 'lang_site') == $name) || ($this->settings('settings', 'lang_admin') == $name)) { + $this->notify('failure', $this->lang('lang_deactivate_failure')); + } else { + if (touch(BASE_DIR.'/inc/lang/'.$name.'/.lock')) { + $this->notify('success', $this->lang('lang_deactivate_success')); + } else { + $this->notify('failure', $this->lang('lang_deactivate_failure')); + } + } + + redirect(url([ADMIN, 'settings', 'translation'])); + } + public function anyUpdates() { $this->tpl->set('allow_curl', intval(function_exists('curl_init'))); diff --git a/inc/modules/settings/Info.php b/inc/modules/settings/Info.php index 0aa90d7..a0ce5ae 100644 --- a/inc/modules/settings/Info.php +++ b/inc/modules/settings/Info.php @@ -13,8 +13,8 @@ return [ 'name' => $core->lang['settings']['module_name'], 'description' => $core->lang['settings']['module_desc'], 'author' => 'Sruu.pl', - 'version' => '1.2', - 'compatibility' => '1.3.*', + 'version' => '1.3', + 'compatibility' => '1.3.*', 'icon' => 'wrench', 'install' => function () use ($core) { @@ -35,7 +35,7 @@ return [ $core->db()->pdo()->exec("INSERT INTO `settings` (`module`, `field`, `value`) VALUES ('settings', 'editor', 'wysiwyg')"); $core->db()->pdo()->exec("INSERT INTO `settings` (`module`, `field`, `value`) VALUES ('settings', 'lang_site', 'en_english')"); $core->db()->pdo()->exec("INSERT INTO `settings` (`module`, `field`, `value`) VALUES ('settings', 'lang_admin', 'en_english')"); - $core->db()->pdo()->exec("INSERT INTO `settings` (`module`, `field`, `value`) VALUES ('settings', 'version', '1.3.4')"); + $core->db()->pdo()->exec("INSERT INTO `settings` (`module`, `field`, `value`) VALUES ('settings', 'version', '1.3.5')"); $core->db()->pdo()->exec("INSERT INTO `settings` (`module`, `field`, `value`) VALUES ('settings', 'update_check', '0')"); $core->db()->pdo()->exec("INSERT INTO `settings` (`module`, `field`, `value`) VALUES ('settings', 'update_changelog', '')"); $core->db()->pdo()->exec("INSERT INTO `settings` (`module`, `field`, `value`) VALUES ('settings', 'update_version', '0')"); diff --git a/inc/modules/settings/lang/admin/en_english.ini b/inc/modules/settings/lang/admin/en_english.ini index 2a0c5eb..015728d 100644 --- a/inc/modules/settings/lang/admin/en_english.ini +++ b/inc/modules/settings/lang/admin/en_english.ini @@ -1,71 +1,78 @@ -module_name = "Settings" -module_desc = "Basic settings of Batflat." +module_name = "Settings" +module_desc = "Basic settings of Batflat." -general = "General" -translation = "Translation" -system_info = "System informations" -php_version = "PHP version" -sqlite_version = "SQLite version" -system_size = "Batflat size" -sqlite_size = "Database size" -other = "Other" -updates = "Updates" -title = "Website title" -description = "Description" -keywords = "Keywords" -homepage = "Homepage" -site_lang = "Website language" -admin_lang = "Admin language" -footer = "Footer" -editor = "Editor" -timezone = "Timezone" +general = "General" +translation = "Translation" +system_info = "System informations" +php_version = "PHP version" +sqlite_version = "SQLite version" +system_size = "Batflat size" +sqlite_size = "Database size" +other = "Other" +updates = "Updates" +title = "Website title" +description = "Description" +keywords = "Keywords" +homepage = "Homepage" +site_lang = "Website language" +admin_lang = "Admin language" +footer = "Footer" +editor = "Editor" +timezone = "Timezone" -version = "Version" -license = "License" -check_updates = "Check updates" -update_fopen_error = "Unable to update system with current server configuration." -update_curl_error = "Unable to update system with current server configuration." +version = "Version" +license = "License" +check_updates = "Check updates" +update_fopen_error = "Unable to update system with current server configuration." +update_curl_error = "Unable to update system with current server configuration." -author = "Author" -active = "Active" -activate = "Activate" -theme_changed = "Default template was changed." +author = "Author" +active = "Active" +activate = "Activate" +theme_changed = "Default template was changed." -update_info = "Thanks to Batflat updates system is always safe and up-to-date!" -update_available = "New version is available" -update_button = "Update" -update_check = "Check update" -up_to_date = "Great! Batflat is up-to-date :)" -update_newer_version = "It's weird but... you have newer version than we do :D" +update_info = "Thanks to Batflat updates system is always safe and up-to-date!" +update_available = "New version is available" +update_button = "Update" +update_check = "Check update" +up_to_date = "Great! Batflat is up-to-date :)" +update_newer_version = "It's weird but... you have newer version than we do :D" -save_settings_success = "Settings successfully saved." -save_settings_failure = "Failed to save settings." -save_file_success = "File successfully saved." -save_file_failure = "Unable to save file." +save_settings_success = "Settings successfully saved." +save_settings_failure = "Failed to save settings." +save_file_success = "File successfully saved." +save_file_failure = "Unable to save file." -file_lock = "File editing is disabled. You cannot edit files through admin panel." +file_lock = "File editing is disabled. You cannot edit files through admin panel." -notranslation = "No translation" -new_lang = "New language" -new_lang_failure = "Language name is incorrect. It should match pattern: en_english." -new_lang_exists = "Language already exists." -new_lang_success = "Language successfully created." -new_lang_create_fail = "Unable to create language." -lang_export = "Export language" -lang_import = "Import language" -lang_import_success = "Successfully uploaded language." -lang_import_error = "Package contains one or more illegal files." -lang_upload = "Choose ZIP file containing language pack." +notranslation = "No translation" +new_lang = "New language" +new_lang_failure = "Language name is incorrect. It should match pattern: en_english." +new_lang_exists = "Language already exists." +new_lang_success = "Language successfully created." +new_lang_create_fail = "Unable to create language." +lang_export = "Export language" +lang_import = "Import language" +lang_import_success = "Successfully uploaded language." +lang_import_error = "Package contains one or more illegal files." +lang_upload = "Choose ZIP file containing language pack." +lang_list = "Languages list" +lang_delete_success = "The selected language has been successfully removed from the server." +lang_delete_failure = "The selected language could not be deleted. Check if it is used as the default by the website." +lang_activate_success = "The new language has been successfully activated." +lang_activate_failure = "The new language could not be activated. Check the access rights to the language directory." +lang_deactivate_success = "The selected language has been deactivated successfully." +lang_deactivate_failure = "The selected language could not be deactivated. Check the access rights to the language directory." -license_key = "License key" -license_invalid_key = "Invalid license key." -license_good_key = "License key has been successfully accepted." -confirm_downgrade = "Are you sure you want downgrade Batflat to Free license?" -downgrade = "Downgrade to Free" -upgrade = "Upgrade to Commercial" -free = "Free" -commercial = "Commercial" -invalid_license = "Invalid license" +license_key = "License key" +license_invalid_key = "Invalid license key." +license_good_key = "License key has been successfully accepted." +confirm_downgrade = "Are you sure you want downgrade Batflat to Free license?" +downgrade = "Downgrade to Free" +upgrade = "Upgrade to Commercial" +free = "Free" +commercial = "Commercial" +invalid_license = "Invalid license" -get_commercial = "If you want to create a website for your client, choose a commercial license." -activate_info = "To activate the commercial version of the system, enter the license code. You will find it in the email confirming the purchase of the Batflat license." \ No newline at end of file +get_commercial = "If you want to create a website for your client, choose a commercial license." +activate_info = "To activate the commercial version of the system, enter the license code. You will find it in the email confirming the purchase of the Batflat license." \ No newline at end of file diff --git a/inc/modules/settings/lang/admin/es_spanish.ini b/inc/modules/settings/lang/admin/es_spanish.ini index b22b198..f73b55b 100644 --- a/inc/modules/settings/lang/admin/es_spanish.ini +++ b/inc/modules/settings/lang/admin/es_spanish.ini @@ -1,71 +1,78 @@ module_name = "Parámetros" module_desc = "Parámetros básicos de Batflat." -general = "General" -translation = "Traducción" -system_info = "Información del sistema" -php_version = "Versión PHP" -sqlite_version = "Versión SQLite" -system_size = "Tamaño de Batflat" -sqlite_size = "Tamaño de la base de datos" -other = "Otros" -updates = "Actualizaciones" -title = "Título del sitio" -description = "Descripción" -keywords = "Palabras clave" -homepage = "Inicio" -site_lang = "Idioma del sitio" -admin_lang = "Idioma de administración" -footer = "Pié de página" -editor = "Editor" -timezone = "Zona horaria" +general = "General" +translation = "Traducción" +system_info = "Información del sistema" +php_version = "Versión PHP" +sqlite_version = "Versión SQLite" +system_size = "Tamaño de Batflat" +sqlite_size = "Tamaño de la base de datos" +other = "Otros" +updates = "Actualizaciones" +title = "Título del sitio" +description = "Descripción" +keywords = "Palabras clave" +homepage = "Inicio" +site_lang = "Idioma del sitio" +admin_lang = "Idioma de administración" +footer = "Pié de página" +editor = "Editor" +timezone = "Zona horaria" -version = "Versión" -license = "Licencia" -check_updates = "Comprobar actualizaciones" -update_fopen_error = "Imposible actualizar el sistema con la configuración del servidor actual." -update_curl_error = "Imposible actualizar el sistema con la configuración del servidor actual." +version = "Versión" +license = "Licencia" +check_updates = "Comprobar actualizaciones" +update_fopen_error = "Imposible actualizar el sistema con la configuración del servidor actual." +update_curl_error = "Imposible actualizar el sistema con la configuración del servidor actual." -author = "Autor" -active = "Activo" -activate = "Activar" -theme_changed = "La plantilla por defecto fue cambiada." +author = "Autor" +active = "Activo" +activate = "Activar" +theme_changed = "La plantilla por defecto fue cambiada." -update_info = "¡Gracias a las actualizaciones de Batflat el sistema se mantiene seguro y al día!" -update_available = "Nueva versión disponible" -update_button = "Actualizar" -update_check = "Comprobar actualización" -up_to_date = "¡Genial! Batflat está al día :)" -update_newer_version = "Es raro pero... tienes una versión más actual que la nuestra :D" +update_info = "¡Gracias a las actualizaciones de Batflat el sistema se mantiene seguro y al día!" +update_available = "Nueva versión disponible" +update_button = "Actualizar" +update_check = "Comprobar actualización" +up_to_date = "¡Genial! Batflat está al día :)" +update_newer_version = "Es raro pero... tienes una versión más actual que la nuestra :D" -save_settings_success = "Parámetros correctamente guardados." -save_settings_failure = "Fallo al guardar los parámetros." -save_file_success = "Fichero correctamente guardado." -save_file_failure = "Imposible guardar fichero." +save_settings_success = "Parámetros correctamente guardados." +save_settings_failure = "Fallo al guardar los parámetros." +save_file_success = "Fichero correctamente guardado." +save_file_failure = "Imposible guardar fichero." -file_lock = "Modificación de fichero deshabilitada. No puede moficiar ficheros mediante el panel de administración." +file_lock = "Modificación de fichero deshabilitada. No puede moficiar ficheros mediante el panel de administración." -notranslation = "Sin traducción" -new_lang = "Nuevo idioma" -new_lang_failure = "Nombre de idioma incorrecto. Debería corresponder al patrón: en_english." -new_lang_exists = "Idioma ya existente." -new_lang_success = "Idioma correctamente creado." -new_lang_create_fail = "Imposible crear el idioma." -lang_export = "Exportar idioma" -lang_import = "Importar idioma" -lang_import_success = "Idioma correctamente actualizado." -lang_import_error = "El paquete contiene uno o más ficheros ilegales." -lang_upload = "Elija el fichero ZIP conteniendo el paquete del idioma." +notranslation = "Sin traducción" +new_lang = "Nuevo idioma" +new_lang_failure = "Nombre de idioma incorrecto. Debería corresponder al patrón: en_english." +new_lang_exists = "Idioma ya existente." +new_lang_success = "Idioma correctamente creado." +new_lang_create_fail = "Imposible crear el idioma." +lang_export = "Exportar idioma" +lang_import = "Importar idioma" +lang_import_success = "Idioma correctamente actualizado." +lang_import_error = "El paquete contiene uno o más ficheros ilegales." +lang_upload = "Elija el fichero ZIP conteniendo el paquete del idioma." +lang_list = "Languages list" +lang_delete_success = "The selected language has been successfully removed from the server." +lang_delete_failure = "The selected language could not be deleted. Check if it is used as the default by the website." +lang_activate_success = "The new language has been successfully activated." +lang_activate_failure = "The new language could not be activated. Check the access rights to the language directory." +lang_deactivate_success = "The selected language has been deactivated successfully." +lang_deactivate_failure = "The selected language could not be deactivated. Check the access rights to the language directory." -license_key = "Clave Licencia" -license_invalid_key = "Clave Licencia Incorrecta." -license_good_key = "Clave Licencia correctamente aceptada." -confirm_downgrade = "¿Seguro que desea pasar Batflat a una Licencia Libre?" -downgrade = "Desactualizar a Licencia Libre" -upgrade = "Actualizar a Licencia Comercial" -free = "Libre" -commercial = "Comercial" -invalid_license = "Licencia incorrecta" +license_key = "Clave Licencia" +license_invalid_key = "Clave Licencia Incorrecta." +license_good_key = "Clave Licencia correctamente aceptada." +confirm_downgrade = "¿Seguro que desea pasar Batflat a una Licencia Libre?" +downgrade = "Desactualizar a Licencia Libre" +upgrade = "Actualizar a Licencia Comercial" +free = "Libre" +commercial = "Comercial" +invalid_license = "Licencia incorrecta" -get_commercial = "Si desea crear un sitio para sus clientes, elija una licencia comercial." -activate_info = "Para activar la versión comercial del sistema, indique el código de licencia. La encontrará en el correo de confirmación de la compra de la licencia BatFlat." +get_commercial = "Si desea crear un sitio para sus clientes, elija una licencia comercial." +activate_info = "Para activar la versión comercial del sistema, indique el código de licencia. La encontrará en el correo de confirmación de la compra de la licencia BatFlat." diff --git a/inc/modules/settings/lang/admin/fr_french.ini b/inc/modules/settings/lang/admin/fr_french.ini index 151264d..03698f5 100644 --- a/inc/modules/settings/lang/admin/fr_french.ini +++ b/inc/modules/settings/lang/admin/fr_french.ini @@ -1,71 +1,78 @@ module_name = "Réglages" module_desc = "Réglages basiques de Batflat." -general = "General" -translation = "Traductions" -system_info = "Informations du système" -php_version = "Version de PHP" -sqlite_version = "Version de SQLite" -system_size = "Taille de Batflat" -sqlite_size = "Taille de la base de données" -other = "Autres" -updates = "Mise à jour" -title = "Titre du site web" -description = "Description" -keywords = "Mots clés" -homepage = "Page d'accueil" -site_lang = "Langue du site" -admin_lang = "Langue du panneau administrateur" -footer = "Pied de page" -editor = "Editeur" -timezone = "Timezone" +general = "General" +translation = "Traductions" +system_info = "Informations du système" +php_version = "Version de PHP" +sqlite_version = "Version de SQLite" +system_size = "Taille de Batflat" +sqlite_size = "Taille de la base de données" +other = "Autres" +updates = "Mise à jour" +title = "Titre du site web" +description = "Description" +keywords = "Mots clés" +homepage = "Page d'accueil" +site_lang = "Langue du site" +admin_lang = "Langue du panneau administrateur" +footer = "Pied de page" +editor = "Editeur" +timezone = "Timezone" -version = "Version du système" -license = "License" -check_updates = "Vérifier les mises à jour" -update_fopen_error = "Impossible de mettre à jour le système avec la configuration serveur actuelle." -update_curl_error = "Impossible de mettre à jour le système avec la configuration serveur actuelle." +version = "Version du système" +license = "License" +check_updates = "Vérifier les mises à jour" +update_fopen_error = "Impossible de mettre à jour le système avec la configuration serveur actuelle." +update_curl_error = "Impossible de mettre à jour le système avec la configuration serveur actuelle." -author = "Auteur" -active = "Actif" -activate = "Activer" -theme_changed = "Le modèle par défaut à changé." +author = "Auteur" +active = "Actif" +activate = "Activer" +theme_changed = "Le modèle par défaut à changé." -update_info = "Grâce au système de mises à jour Batflat, il est toujours sûr et à jour !" -update_available = "Nouvelle version disponible" -update_button = "Mise à jour" -update_check = "Verifier les mises à jour" -up_to_date = "Super ! Batflat est à jour :)" -update_newer_version = "C'est bizzare mais... vous avez une version plus récente que la notre :D" +update_info = "Grâce au système de mises à jour Batflat, il est toujours sûr et à jour !" +update_available = "Nouvelle version disponible" +update_button = "Mise à jour" +update_check = "Verifier les mises à jour" +up_to_date = "Super ! Batflat est à jour :)" +update_newer_version = "C'est bizzare mais... vous avez une version plus récente que la notre :D" -save_settings_success = "Réglages sauvegardé avec succès." -save_settings_failure = "Echec de sauvegarde des réglages." -save_file_success = "Fichier sauvegardé avec succès." -save_file_failure = "Impossible de sauvegarder le fichier." +save_settings_success = "Réglages sauvegardé avec succès." +save_settings_failure = "Echec de sauvegarde des réglages." +save_file_success = "Fichier sauvegardé avec succès." +save_file_failure = "Impossible de sauvegarder le fichier." -file_lock = "L'edition de fichier est désactivé. Vous ne pouvez pas editer des fichiers depuis le panneau administrateur." +file_lock = "L'edition de fichier est désactivé. Vous ne pouvez pas editer des fichiers depuis le panneau administrateur." -notranslation = "Pas de traduction" -new_lang = "Nouvelle langue" -new_lang_failure = "Le nom de la langue est incorrect. Il devrait ressembler au format: en_english." -new_lang_exists = "La langue existe déjà." -new_lang_success = "La langue a été créé avec succès." -new_lang_create_fail = "Impossible de créer la langue." -lang_export = "Exporter la langue" -lang_import = "Importer la langue" -lang_import_success = "Langue upload avec succès." -lang_import_error = "L'import contient un ou plusieurs fichiers illégaux." -lang_upload = "Choisissez un fichier ZIP qui contient une langue." +notranslation = "Pas de traduction" +new_lang = "Nouvelle langue" +new_lang_failure = "Le nom de la langue est incorrect. Il devrait ressembler au format: en_english." +new_lang_exists = "La langue existe déjà." +new_lang_success = "La langue a été créé avec succès." +new_lang_create_fail = "Impossible de créer la langue." +lang_export = "Exporter la langue" +lang_import = "Importer la langue" +lang_import_success = "Langue upload avec succès." +lang_import_error = "L'import contient un ou plusieurs fichiers illégaux." +lang_upload = "Choisissez un fichier ZIP qui contient une langue." +lang_list = "Languages list" +lang_delete_success = "The selected language has been successfully removed from the server." +lang_delete_failure = "The selected language could not be deleted. Check if it is used as the default by the website." +lang_activate_success = "The new language has been successfully activated." +lang_activate_failure = "The new language could not be activated. Check the access rights to the language directory." +lang_deactivate_success = "The selected language has been deactivated successfully." +lang_deactivate_failure = "The selected language could not be deactivated. Check the access rights to the language directory." -license_key = "Clé de licence" -license_invalid_key = "Clé de licence invalide." -license_good_key = "La clé de licence à été acceptée." -confirm_downgrade = "Etes-vous sur de vouloir rétrograder Batflat vers la version gratuite ?" -downgrade = "Rétrograder vers la version gratuite" -upgrade = "Mettre à jour vers la version commerciale" -free = "Gratuit" -commercial = "Commerciale" -invalid_license = "Licence invalide" +license_key = "Clé de licence" +license_invalid_key = "Clé de licence invalide." +license_good_key = "La clé de licence à été acceptée." +confirm_downgrade = "Etes-vous sur de vouloir rétrograder Batflat vers la version gratuite ?" +downgrade = "Rétrograder vers la version gratuite" +upgrade = "Mettre à jour vers la version commerciale" +free = "Gratuit" +commercial = "Commerciale" +invalid_license = "Licence invalide" -get_commercial = "Si vous voulez créer un site web pour votre client, choisissez une licence commerciale." -activate_info = "Pour activer la version commerciale du système, entrez le code de licence. Vous la trouverez dans l'email de confirmation d'achat de la licence Batflat." \ No newline at end of file +get_commercial = "Si vous voulez créer un site web pour votre client, choisissez une licence commerciale." +activate_info = "Pour activer la version commerciale du système, entrez le code de licence. Vous la trouverez dans l'email de confirmation d'achat de la licence Batflat." \ No newline at end of file diff --git a/inc/modules/settings/lang/admin/it_italian.ini b/inc/modules/settings/lang/admin/it_italian.ini index 10fcbaf..79fa380 100644 --- a/inc/modules/settings/lang/admin/it_italian.ini +++ b/inc/modules/settings/lang/admin/it_italian.ini @@ -49,6 +49,13 @@ lang_import = "Importa la lingua" lang_import_success = "Lingua caricata con successo." lang_import_error = "Il pacchetto contiene uno o più file non validi." lang_upload = "Selezionare il file ZIP che contiene i pacchetti della lingua." +lang_list = "Languages list" +lang_delete_success = "The selected language has been successfully removed from the server." +lang_delete_failure = "The selected language could not be deleted. Check if it is used as the default by the website." +lang_activate_success = "The new language has been successfully activated." +lang_activate_failure = "The new language could not be activated. Check the access rights to the language directory." +lang_deactivate_success = "The selected language has been deactivated successfully." +lang_deactivate_failure = "The selected language could not be deactivated. Check the access rights to the language directory." license_key = "Chiave di licenza" license_invalid_key = "Chiave di licenza non valida." license_good_key = "Chiave di licenza validata con successo." diff --git a/inc/modules/settings/lang/admin/nl_dutch.ini b/inc/modules/settings/lang/admin/nl_dutch.ini index ce0ad3a..7e90d8c 100644 --- a/inc/modules/settings/lang/admin/nl_dutch.ini +++ b/inc/modules/settings/lang/admin/nl_dutch.ini @@ -1,71 +1,78 @@ -module_name = "Instellingen" -module_desc = "Basisinstellingen van Batflat." +module_name = "Instellingen" +module_desc = "Basisinstellingen van Batflat." -general = "Algemeen" -translation = "Vertaling" -system_info = "Systeeminformatie" -php_version = "PHP-versie" -sqlite_version = "SQLite-versie" -system_size = "Batflat-grootte" -sqlite_size = "Databasegrootte" -other = "Ander" -updates = "Updates" -title = "Websitetitel" -description = "Beschrijving" -keywords = "Trefwoorden" -homepage = "Homepage" -site_lang = "Taal van de website" -admin_lang = "Beheer taal" -footer = "Footer" -editor = "Editor" -timezone = "Tijdzone" +general = "Algemeen" +translation = "Vertaling" +system_info = "Systeeminformatie" +php_version = "PHP-versie" +sqlite_version = "SQLite-versie" +system_size = "Batflat-grootte" +sqlite_size = "Databasegrootte" +other = "Ander" +updates = "Updates" +title = "Websitetitel" +description = "Beschrijving" +keywords = "Trefwoorden" +homepage = "Homepage" +site_lang = "Taal van de website" +admin_lang = "Beheer taal" +footer = "Footer" +editor = "Editor" +timezone = "Tijdzone" -version = "Versie" -license = "Licentie" -check_updates = "Check updates" -update_fopen_error = "Kan het systeem niet bijwerken met de huidige serverconfiguratie." -update_curl_error = "Kan het systeem niet bijwerken met de huidige serverconfiguratie." +version = "Versie" +license = "Licentie" +check_updates = "Check updates" +update_fopen_error = "Kan het systeem niet bijwerken met de huidige serverconfiguratie." +update_curl_error = "Kan het systeem niet bijwerken met de huidige serverconfiguratie." -author = "Auteur" -active = "Actief" -activate = "Activeren" -theme_changed = "Standaardsjabloon is gewijzigd." +author = "Auteur" +active = "Actief" +activate = "Activeren" +theme_changed = "Standaardsjabloon is gewijzigd." -update_info = "Dankzij de updates van Batflat is het systeem altijd veilig en up-to-date!" -update_available = "Nieuwe versie is beschikbaar" -update_button = "Bijwerken" -update_check = "Controleer update" -up_to_date = "Super goed! Batflat is up-to-date :)" -update_newer_version = "Het is raar maar ... je hebt een nieuwere versie dan wij: D" +update_info = "Dankzij de updates van Batflat is het systeem altijd veilig en up-to-date!" +update_available = "Nieuwe versie is beschikbaar" +update_button = "Bijwerken" +update_check = "Controleer update" +up_to_date = "Super goed! Batflat is up-to-date :)" +update_newer_version = "Het is raar maar ... je hebt een nieuwere versie dan wij: D" -save_settings_success = "Instellingen succesvol opgeslagen." -save_settings_failure = "Instellingen opslaan mislukt." -save_file_success = "Bestand succesvol opgeslagen." -save_file_failure = "Kan bestand niet opslaan." +save_settings_success = "Instellingen succesvol opgeslagen." +save_settings_failure = "Instellingen opslaan mislukt." +save_file_success = "Bestand succesvol opgeslagen." +save_file_failure = "Kan bestand niet opslaan." -file_lock = "Bestandsbewerking is uitgeschakeld. U kunt geen bestanden bewerken via het beheerderspaneel." +file_lock = "Bestandsbewerking is uitgeschakeld. U kunt geen bestanden bewerken via het beheerderspaneel." -notranslation = "Geen vertaling" -new_lang = "Nieuwe taal" -new_lang_failure = "Taalnaam is onjuist. Het moet overeenkomen met patroon: en_english." -new_lang_exists = "Taal bestaat al." -new_lang_success = "Taal succesvol aangemaakt." -new_lang_create_fail = "Kan taal niet maken." -lang_export = "Taal exporteren" -lang_import = "Taal importeren" -lang_import_success = "Taal succesvol geüpload." -lang_import_error = "Pakket bevat een of meer illegale bestanden." -lang_upload = "Kies ZIP-bestand met taalpakket." +notranslation = "Geen vertaling" +new_lang = "Nieuwe taal" +new_lang_failure = "Taalnaam is onjuist. Het moet overeenkomen met patroon: en_english." +new_lang_exists = "Taal bestaat al." +new_lang_success = "Taal succesvol aangemaakt." +new_lang_create_fail = "Kan taal niet maken." +lang_export = "Taal exporteren" +lang_import = "Taal importeren" +lang_import_success = "Taal succesvol geüpload." +lang_import_error = "Pakket bevat een of meer illegale bestanden." +lang_upload = "Kies ZIP-bestand met taalpakket." +lang_list = "Languages list" +lang_delete_success = "The selected language has been successfully removed from the server." +lang_delete_failure = "The selected language could not be deleted. Check if it is used as the default by the website." +lang_activate_success = "The new language has been successfully activated." +lang_activate_failure = "The new language could not be activated. Check the access rights to the language directory." +lang_deactivate_success = "The selected language has been deactivated successfully." +lang_deactivate_failure = "The selected language could not be deactivated. Check the access rights to the language directory." -license_key = "Licentiesleutel" -license_invalid_key = "Ongeldige licentiesleutel." -license_good_key = "Licentiesleutel is succesvol geaccepteerd." -confirm_downgrade = "Weet je zeker dat je de Batflat naar gratis licentie wilt downgraden?" -downgrade = "Downgrade naar gratis" -upgrade = "Upgrade naar Commercial" -free = "Gratis" -commercial = "Commercieel" -invalid_license = "Ongeldige licentie" +license_key = "Licentiesleutel" +license_invalid_key = "Ongeldige licentiesleutel." +license_good_key = "Licentiesleutel is succesvol geaccepteerd." +confirm_downgrade = "Weet je zeker dat je de Batflat naar gratis licentie wilt downgraden?" +downgrade = "Downgrade naar gratis" +upgrade = "Upgrade naar Commercial" +free = "Gratis" +commercial = "Commercieel" +invalid_license = "Ongeldige licentie" -get_commercial = "Als u een website voor uw klant wilt maken, kiest u een commercial license." -activate_info = "Om de commerciële versie van het systeem te activeren, voert u de licentiecode in. U vindt het in de e-mail waarin de aankoop van de Batflat-licentie wordt bevestigd." +get_commercial = "Als u een website voor uw klant wilt maken, kiest u een commercial license." +activate_info = "Om de commerciële versie van het systeem te activeren, voert u de licentiecode in. U vindt het in de e-mail waarin de aankoop van de Batflat-licentie wordt bevestigd." diff --git a/inc/modules/settings/lang/admin/pl_polski.ini b/inc/modules/settings/lang/admin/pl_polski.ini index 6a5035d..c69ee9a 100644 --- a/inc/modules/settings/lang/admin/pl_polski.ini +++ b/inc/modules/settings/lang/admin/pl_polski.ini @@ -56,6 +56,13 @@ lang_import = "Importuj język" lang_import_success = "Pomyślnie wgrano język." lang_import_error = "Paczka zawiera jeden lub więcej niedozwolonych plików." lang_upload = "Wybierz z dysku plik ZIP zawierający pliki językowe." +lang_list = "Lista języków" +lang_delete_success = "Pomyślnie usunięto wybrany język z serwera." +lang_delete_failure = "Nie udało się usunąć wybranego języka. Sprawdź czy jest używany jako domyślny przez stronę." +lang_activate_success = "Pomyślnie aktywowano nowy język." +lang_activate_failure = "Nie udało się aktywować nowego języka. Sprawdź prawa dostępu do katalogu językowego." +lang_deactivate_success = "Pomyślnie dezaktywowano wybrany język." +lang_deactivate_failure = "Nie udało się dezaktywować wybranego języka. Sprawdź prawa dostępu do katalogu językowego." license_key = "Klucz licencyjny" license_invalid_key = "Niepoprawny klucz licencyjny" diff --git a/inc/modules/settings/lang/admin/ru_russian.ini b/inc/modules/settings/lang/admin/ru_russian.ini index fc03a52..162d076 100644 --- a/inc/modules/settings/lang/admin/ru_russian.ini +++ b/inc/modules/settings/lang/admin/ru_russian.ini @@ -57,6 +57,13 @@ lang_import = "Импортировать язык" lang_import_success = "Языковой пакет успешно импортирован." lang_import_error = "Языковой пакет содержит один или несколько некорректных файлов." lang_upload = "Выберите ZIP файл содержащий языковой пакет." +lang_list = "Languages list" +lang_delete_success = "The selected language has been successfully removed from the server." +lang_delete_failure = "The selected language could not be deleted. Check if it is used as the default by the website." +lang_activate_success = "The new language has been successfully activated." +lang_activate_failure = "The new language could not be activated. Check the access rights to the language directory." +lang_deactivate_success = "The selected language has been deactivated successfully." +lang_deactivate_failure = "The selected language could not be deactivated. Check the access rights to the language directory." license_key = "Лицензионный ключ" license_invalid_key = "Неверный лицензионный ключ." @@ -68,5 +75,5 @@ free = "Бесплатная лицензия" commercial = "Коммерческая лицензия" invalid_license = "Неверная лицензия" -get_commercial = "Если вы хотите создать сайт для своих клиентов ,то выберите Коммерческая лицензия." +get_commercial = "Если вы хотите создать сайт для своих клиентов ,то выберите Коммерческая лицензия." activate_info = "Чтобы активировать коммерческую версию системы, введите лицензионный ключ. Вы найдете его в письме, подтверждающем покупку лицензии Batflat." \ No newline at end of file diff --git a/inc/modules/settings/lang/admin/se_swedish.ini b/inc/modules/settings/lang/admin/se_swedish.ini index e1b18db..b273b08 100644 --- a/inc/modules/settings/lang/admin/se_swedish.ini +++ b/inc/modules/settings/lang/admin/se_swedish.ini @@ -1,15 +1,15 @@ module_name = "Inställningar" module_desc = "Grundinställningar i CMS." -general = "Generella" +general = "Generella" translation = "Översättning" -system_info = "Systeminformation" +system_info = "Systeminformation" php_version = "PHP version" sqlite_version = "SQLite version" system_size = "CMS storlek" sqlite_size = "Databas storlek" -other = "Övrigt" -updates = "Uppdateringar" +other = "Övrigt" +updates = "Uppdateringar" title = "Webbplatsens title" description = "Beskrivning" keywords = "Nyckelord - sökord" @@ -20,22 +20,22 @@ footer = "Footer" editor = "Editor" timezone = "Tidson" -version = "Systemversion" -license = "License" -check_updates = "Sök uppdatering" -update_fopen_error = "Det går inte att uppdatera systemet med nuvarande serverkonfiguration." -update_curl_error = "Kan inte uppdatera systemet med nuvarande serverkonfiguration." +version = "Systemversion" +license = "License" +check_updates = "Sök uppdatering" +update_fopen_error = "Det går inte att uppdatera systemet med nuvarande serverkonfiguration." +update_curl_error = "Kan inte uppdatera systemet med nuvarande serverkonfiguration." -author = "Skribent" -active = "Aktiv" -activate = "Aktivera" -theme_changed = "Standardmallen är ändrad." +author = "Skribent" +active = "Aktiv" +activate = "Aktivera" +theme_changed = "Standardmallen är ändrad." -update_info = "Uppdateringssystemet är alltid säkert och uppdaterat!" -update_available = "Ny version finns tillgänglig!" -update_button = "Uppdatera" -update_check = "Sök uppdatering" -up_to_date = "Perfekt! Batflat uppdaterat :)" +update_info = "Uppdateringssystemet är alltid säkert och uppdaterat!" +update_available = "Ny version finns tillgänglig!" +update_button = "Uppdatera" +update_check = "Sök uppdatering" +up_to_date = "Perfekt! Batflat uppdaterat :)" update_newer_version = "Märkligt... du har en nyare version än oss :D" save_settings_success = "Inställningarna sparades korrekt." @@ -43,7 +43,7 @@ save_settings_failure = "Misslyckades med att spara inställningarna." save_file_success = "Filen sparades korrekt." save_file_failure = "Kunde inte spara filen." -file_lock = "Filredigeringen är avstäng. Du kan inte redigera filen via adminpanelen." +file_lock = "Filredigeringen är avstäng. Du kan inte redigera filen via adminpanelen." notranslation = "Ingen översättning" new_lang = "Nytt språk" @@ -56,6 +56,13 @@ lang_import = "Importera språk" lang_import_success = "Uppladdning av språk lyckades." lang_import_error = "Paketet innehåller en eller flera ogiltiga filer." lang_upload = "Välj ZIP-fil som innehåller språkpaket." +lang_list = "Languages list" +lang_delete_success = "The selected language has been successfully removed from the server." +lang_delete_failure = "The selected language could not be deleted. Check if it is used as the default by the website." +lang_activate_success = "The new language has been successfully activated." +lang_activate_failure = "The new language could not be activated. Check the access rights to the language directory." +lang_deactivate_success = "The selected language has been deactivated successfully." +lang_deactivate_failure = "The selected language could not be deactivated. Check the access rights to the language directory." license_key = "Licensnyckel" license_invalid_key = "Felaktig licensnyckel." diff --git a/inc/modules/settings/lang/admin/tr_turkish.ini b/inc/modules/settings/lang/admin/tr_turkish.ini index 9c41960..d46b97f 100644 --- a/inc/modules/settings/lang/admin/tr_turkish.ini +++ b/inc/modules/settings/lang/admin/tr_turkish.ini @@ -49,6 +49,13 @@ lang_import = "Dil dosyasını içe aktar" lang_import_success = "Dil dosyası başarıyla yüklendi." lang_import_error = "Pakette en az bir tane hatalı dosya bulunuyor." lang_upload = "Dil verisini içeren ZIP dosyasını seçin." +lang_list = "Languages list" +lang_delete_success = "The selected language has been successfully removed from the server." +lang_delete_failure = "The selected language could not be deleted. Check if it is used as the default by the website." +lang_activate_success = "The new language has been successfully activated." +lang_activate_failure = "The new language could not be activated. Check the access rights to the language directory." +lang_deactivate_success = "The selected language has been deactivated successfully." +lang_deactivate_failure = "The selected language could not be deactivated. Check the access rights to the language directory." license_key = "Lisans anahtarı" license_invalid_key = "Hatalı lisans anahtarı." license_good_key = "Lisans anahtarı kabul edildi." @@ -58,5 +65,5 @@ upgrade = "Ticari Sürüme Yükselt" free = "Ücretsiz" commercial = "Ticari" invalid_license = "Hatalı lisans" -get_commercial = "Eğer bir müşteriniz için sayfa oluşturmak isterseniz, lütfen ticari sürüme yükseltin." +get_commercial = "Eğer bir müşteriniz için sayfa oluşturmak isterseniz, lütfen ticari sürüme yükseltin." activate_info = "Ticari sürümü etkinleştirmek için lisans kodu girin. Lisans kodunu satın almanızı takiben gönderilen e-posta mesajında bulabilirsiniz." \ No newline at end of file diff --git a/inc/modules/settings/view/admin/translation.html b/inc/modules/settings/view/admin/translation.html index e9dbd21..50da215 100644 --- a/inc/modules/settings/view/admin/translation.html +++ b/inc/modules/settings/view/admin/translation.html @@ -88,15 +88,29 @@
-

{$lang.settings.lang_export}

+

{$lang.settings.lang_list}

- {loop: $settings.langs} + {loop: $settings.langs_all} {/loop}
{$value.name} - + + + + {if: $value.active} + + + + {else} + + + + {/if} + + +