From 20bbacdd3ff996a9d77d6a53f45a8b49b6bc3a40 Mon Sep 17 00:00:00 2001 From: Denis Malinochkin Date: Thu, 7 Aug 2014 04:14:10 +0400 Subject: [PATCH 01/39] ru_update --- modules/backend/lang/ru/lang.php | 15 +++++++++++++++ modules/cms/lang/ru/lang.php | 6 +++--- modules/system/lang/ru/lang.php | 30 ++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/modules/backend/lang/ru/lang.php b/modules/backend/lang/ru/lang.php index 832e24bfe..b5986ba3d 100644 --- a/modules/backend/lang/ru/lang.php +++ b/modules/backend/lang/ru/lang.php @@ -45,6 +45,9 @@ return [ ], 'dashboard' => [ 'menu_label' => 'Панель управления', + 'widget_label' => 'Виджет', + 'widget_width' => 'Ширина', + 'add_widget' => 'Добавить виджет', ], 'user' => [ 'name' => 'Администратора', @@ -114,6 +117,7 @@ return [ 'undefined_tab' => 'Разное', 'field_off' => 'Выкл', 'field_on' => 'Вкл', + 'add' => 'Добавить', 'apply' => 'Применить', 'cancel' => 'Отмена', 'close' => 'Закрыть', @@ -187,4 +191,15 @@ return [ 'locale' => 'Язык', 'locale_comment' => 'Выберите желаемый язык панели управления.', ], + 'access_log' => [ + 'hint' => 'В этом журнале отображается список успешных попыток авторизаций администраторов. Записи хранятся :days дней.', + 'menu_label' => 'Журнал доступа', + 'menu_description' => 'Просмотр списка успешных авторизаций администраторов.', + 'created_at' => 'Дата & Время', + 'login' => 'Логин', + 'ip_address' => 'IP адересс', + 'first_name' => 'Имя', + 'last_name' => 'Фамилия', + 'email' => 'Почта', + ], ]; diff --git a/modules/cms/lang/ru/lang.php b/modules/cms/lang/ru/lang.php index ef00f4d44..510657d18 100644 --- a/modules/cms/lang/ru/lang.php +++ b/modules/cms/lang/ru/lang.php @@ -5,10 +5,10 @@ return [ 'invalid_file' => "Ошибка в имени файла: :name. Имена файлов могут содержать только латинские буквы, цифры, знаки подчеркивания и точки. Пример правильных имен файлов: page.htm, page, subdirectory/page", 'invalid_property' => 'Параметр ":name" нельзя изменить.', 'file_already_exists' => 'Файл ":name" уже существует.', - 'error_saving' => 'Ошибка сохранения файла ":name".', - 'error_creating_directory' => 'Ошибка создания директории :name', + 'error_saving' => 'Ошибка сохранения файла ":name". Пожалуйста, проверьте права на запись.', + 'error_creating_directory' => 'Ошибка создания директории :name. Пожалуйста, проверьте права на запись.', 'invalid_file_extension'=>'Указано неправильное расширение файла: :invalid. Разрешенные расширения: :allowed.', - 'error_deleting' => 'Невозможно удалить файл шаблона :name.', + 'error_deleting' => 'Невозможно удалить файл шаблона :name. Пожалуйста, проверьте права на запись.', 'delete_success' => 'Шаблоны были успешно удалены: :count.', 'file_name_required' => 'Пожалуйста, укажите имя файла шаблона.' ], diff --git a/modules/system/lang/ru/lang.php b/modules/system/lang/ru/lang.php index cadad8550..f8795f148 100644 --- a/modules/system/lang/ru/lang.php +++ b/modules/system/lang/ru/lang.php @@ -45,6 +45,7 @@ return [ 'refresh_success' => "Выбранные плагины успешно обновлены.", 'disable_success' => "Плагин успешно отключен.", 'enable_success' => "Плагин успешно включен.", + 'unknown_plugin' => "Плагин был удален из файловой системы.", ], 'project' => [ 'name' => 'Проект', @@ -176,4 +177,33 @@ return [ 'zip' => [ 'extract_failed' => "Невозможно извлечь файл ':file'.", ], + 'event_log' => [ + 'hint' => 'В этом журнале отображается список возможных ошибок, которые возникают в работе приложения, таких как исключения и отладочная информация.', + 'menu_label' => 'Журнал событий', + 'menu_description' => 'Просмотр системного журнала событий.', + 'empty_link' => 'Очистить журнал событий', + 'empty_loading' => 'Очищение журнала событий...', + 'empty_success' => 'Успешное очищение журнала событий.', + 'return_link' => 'Вернуться в журнал событий', + 'id' => 'ID', + 'id_label' => 'ID события', + 'created_at' => 'Дата & Время', + 'message' => 'Сообщение', + 'level' => 'Уровень', + ], + 'request_log' => [ + 'hint' => 'В этом журнале отображается список запросов браузера, которые могут потребовать внимания. Например, если посетитель открывает несуществующую страницу, то в журнале создается запись с кодом статуса 404.', + 'menu_label' => 'Журнал запросов', + 'menu_description' => 'Просмотр неудачных или перенаправленных запросов.', + 'empty_link' => 'Очистить журнал запросов', + 'empty_loading' => 'Очищение журнала запросов...', + 'empty_success' => 'Успешное очищение журнала запросов.', + 'return_link' => 'Вернуться к журналу запросов', + 'id' => 'ID', + 'id_label' => 'ID записи', + 'count' => 'Счетчик', + 'referer' => 'Иточник запроса', + 'url' => 'Адрес', + 'status_code' => 'Статус', + ], ]; From 5768ebaabbda4672e17dc3b87412462d4983a855 Mon Sep 17 00:00:00 2001 From: sl1nk3 Date: Thu, 7 Aug 2014 00:31:09 -0400 Subject: [PATCH 02/39] Fixed some issues with the French translation, Added it to the settings menu. --- modules/backend/lang/fr/lang.php | 4 + modules/backend/models/BackendPreferences.php | 7 +- modules/system/lang/en/lang.php | 1 + modules/system/lang/fr/lang.php | 130 +++++++++--------- modules/system/lang/ru/lang.php | 1 + 5 files changed, 77 insertions(+), 66 deletions(-) diff --git a/modules/backend/lang/fr/lang.php b/modules/backend/lang/fr/lang.php index de3c3a6d4..a2f57a87d 100644 --- a/modules/backend/lang/fr/lang.php +++ b/modules/backend/lang/fr/lang.php @@ -45,6 +45,9 @@ return [ ], 'dashboard' => [ 'menu_label' => 'Tableau de bord', + 'widget_label' => 'Widget', + 'widget_width' => 'Taille', + 'add_widget' => 'Ajouter un widget', ], 'user' => [ 'name' => 'Administrateur', @@ -114,6 +117,7 @@ return [ 'undefined_tab' => 'Misc', 'field_off' => 'Off', 'field_on' => 'On', + 'add' => 'Ajouter', 'apply' => 'Appliquer', 'cancel' => 'Annuler', 'close' => 'Fermer', diff --git a/modules/backend/models/BackendPreferences.php b/modules/backend/models/BackendPreferences.php index 010c8cb52..4ffa2f2d7 100644 --- a/modules/backend/models/BackendPreferences.php +++ b/modules/backend/models/BackendPreferences.php @@ -27,7 +27,7 @@ class BackendPreferences extends Model public function getLocaleOptions() { - return [ + $locales = [ 'en' => [Lang::get('system::lang.locale.en'), 'flag-gb'], 'ru' => [Lang::get('system::lang.locale.ru'), 'flag-ru'], 'nl' => [Lang::get('system::lang.locale.nl'), 'flag-nl'], @@ -36,7 +36,12 @@ class BackendPreferences extends Model 'tr' => [Lang::get('system::lang.locale.tr'), 'flag-tr'], 'br' => [Lang::get('system::lang.locale.br'), 'flag-br'], 'de' => [Lang::get('system::lang.locale.de'), 'flag-de'], + 'fr' => [Lang::get('system::lang.locale.fr'), 'flag-fr'], ]; + + // Sort the locales alphabetically + asort($locales); + return $locales; } public function afterSave() diff --git a/modules/system/lang/en/lang.php b/modules/system/lang/en/lang.php index c2f2ffc65..31641c4e4 100644 --- a/modules/system/lang/en/lang.php +++ b/modules/system/lang/en/lang.php @@ -14,6 +14,7 @@ return [ 'br' => 'Brazilian Portuguese', 'de' => 'German', 'ru' => 'Russian', + 'fr' => 'French', ], 'directory' => [ 'create_fail' => "Cannot create directory: :name", diff --git a/modules/system/lang/fr/lang.php b/modules/system/lang/fr/lang.php index 7ee8f5759..e2d1edf57 100644 --- a/modules/system/lang/fr/lang.php +++ b/modules/system/lang/fr/lang.php @@ -6,21 +6,21 @@ return [ 'motto' => 'Getting back to basics', ], 'locale' => [ - 'en' => 'English', - 'nl' => 'Dutch', - 'ja' => 'Japanese', - 'sv' => 'Swedish', - 'tr' => 'Turkish', - 'br' => 'Brazilian Portuguese', - 'de' => 'German', - 'ru' => 'Russian', - 'fr' => 'French', + 'en' => 'Anglais', + 'nl' => 'Néerlandais', + 'ja' => 'Japonais', + 'sv' => 'Suédois', + 'tr' => 'Turque', + 'br' => 'Portugais-Brésilien', + 'de' => 'Allemand', + 'ru' => 'Russe', + 'fr' => 'Français', ], 'directory' => [ - 'create_fail' => "Impossible de créer le répertoire: :name", + 'create_fail' => "Impossible de créer le répertoire : :name", ], 'file' => [ - 'create_fail' => "Impossible de créer le fichier: :name", + 'create_fail' => "Impossible de créer le fichier : :name", ], 'system' => [ 'name' => 'Système', @@ -37,34 +37,34 @@ return [ 'manage' => 'Gérer les plugins', 'enable_or_disable' => 'Activer ou désactiver', 'enable_or_disable_title' => 'Activer ou désactiver les plugins', - 'remove' => 'Supprimé', - 'refresh' => 'Actualisé', + 'remove' => 'Supprimer', + 'refresh' => 'Actualiser', 'disabled_label' => 'Désactivé', 'disabled_help' => 'Les plugins désactivés sont ignoré par l\'application.', - 'selected_amount' => 'Plugins selectioné: :amount', - 'remove_success' => "Successfully removed those plugins from the system.", - 'refresh_success' => "Successfully refreshed those plugins in the system.", - 'disable_success' => "Successfully disabled those plugins.", - 'enable_success' => "Successfully enabled those plugins.", + 'selected_amount' => 'Plugins selectionés : :amount', + 'remove_success' => "Les plugins ont été supprimés avec succès.", + 'refresh_success' => "Les plugins ont été actualisés avec succès.", + 'disable_success' => "Les plugins ont été désactivés avec succès.", + 'enable_success' => "Les plugins ont correctement été activés avec succès.", ], 'project' => [ 'name' => 'Projet', - 'owner_label' => 'Autheur', - 'attach' => 'Attaché un project', - 'detach' => 'Detaché le Project', + 'owner_label' => 'Auteur', + 'attach' => 'Attacher un projet', + 'detach' => 'Detacher le Projet', 'none' => 'Aucun', 'id' => [ 'label' => 'Projet ID', 'help' => 'Comment trouver votre project ID', 'missing' => 'Spécifier un ID de project.', ], - 'detach_confirm' => 'Êtes-vous sûr de vouloir detaché ce projet?', + 'detach_confirm' => 'Êtes-vous sûr de vouloir detacher ce projet?', 'unbind_success' => 'Le projet a été detaché avec succès.', ], 'settings' => [ 'menu_label' => 'Réglages', - 'missing_model' => 'The settings page is missing a Model definition.', - 'update_success' => 'Settings for :name have been updated successfully.', + 'missing_model' => 'La page de réglages nécéssite une définition de modèle.', + 'update_success' => 'Les réglages pour :name ont étés correctement mis à jour.', 'return' => 'Retourner a la page des reglages système', 'search' => 'Rechercher' ], @@ -72,37 +72,37 @@ return [ 'menu_label' => 'Configuration des emails', 'menu_description' => 'Gérer la configuration des emails.', 'general' => 'Generale', - 'method' => 'Mail Method', + 'method' => 'Méthode d\'envoi', 'sender_name' => 'Nom de l\'expéditeur', 'sender_email' => 'Email de l\'expéditeur', 'smtp' => 'SMTP', 'smtp_address' => 'Adresse SMTP', - 'smtp_authorization' => 'Authorisation SMTP requise', - 'smtp_authorization_comment' => 'Use this checkbox if your SMTP server requires authorization.', + 'smtp_authorization' => 'Authentification SMTP requise', + 'smtp_authorization_comment' => 'Cochez cette case si votre serveur SMTP nécéssite une authentification.', 'smtp_username' => 'Identifiant', 'smtp_password' => 'Mot de passe', 'smtp_port' => 'Port SMTP', 'smtp_ssl' => 'Connection SSL requise', 'sendmail' => 'Sendmail', - 'sendmail_path' => 'Sendmail chemin', - 'sendmail_path_comment' => 'Spécifié le chemin du programme sendmail.', + 'sendmail_path' => 'Chemin vers Sendmail', + 'sendmail_path_comment' => 'Spécifiez le chemin du programme sendmail.', ], 'mail_templates' => [ - 'menu_label' => 'Email modèles', + 'menu_label' => 'Modèles d\'Email', 'menu_description' => 'Gérer les modèles et layouts d\'Email envoyés par l\'administration.', 'new_template' => 'Nouveau modèle', 'new_layout' => 'Nouveau Layout', 'template' => 'Modèle', 'templates' => 'Modèles', - 'menu_layouts_label' => 'Email Layouts', + 'menu_layouts_label' => 'Layouts d\'Email', 'layout' => 'Layout', 'layouts' => 'Layouts', 'name' => 'Nom', - 'name_comment' => 'Unique name used to refer to this template', + 'name_comment' => 'Nom unique utilisé pour identifier ce modèle', 'code' => 'Code', - 'code_comment' => 'Unique code used to refer to this template', + 'code_comment' => 'Code unique utilisé pour identifier ce modèle', 'subject' => 'Sujet', - 'subject_comment' => 'Email message subject', + 'subject_comment' => 'Sujet de l\'Email', 'description' => 'Description', 'content_html' => 'HTML', 'content_css' => 'CSS', @@ -114,9 +114,9 @@ return [ 'install' => [ 'project_label' => 'Attacher un project', 'plugin_label' => 'Installer un plugin', - 'missing_plugin_name' => 'Please specify a Plugin name to install.', - 'install_completing' => 'Finishing installation process', - 'install_success' => 'The plugin has been installed successfully.', + 'missing_plugin_name' => 'Merci de spécifier le nom d\'un Plugin à installer.', + 'install_completing' => 'Fin du processus d\'instalation', + 'install_success' => 'Le plugin a été installé avec succès.', ], 'updates' => [ 'title' => 'Gérer les mises à jour', @@ -124,35 +124,35 @@ return [ 'menu_label' => 'Mise à jour', 'menu_description' => 'Mise à jour du système, gestion et installation des plugins et thèmes.', 'check_label' => 'Vérifier les mises à jour', - 'retry_label' => 'Try again', + 'retry_label' => 'Réessayer', 'plugin_name' => 'Nom', 'plugin_description' => 'Description', 'plugin_version' => 'Version', 'plugin_author' => 'Auteur', - 'core_build' => 'Current build', - 'core_build_old' => 'Current build :build', - 'core_build_new' => 'Build :build', - 'core_build_new_help' => 'Latest build is available.', - 'core_downloading' => 'Downloading application files', - 'core_extracting' => 'Unpacking application files', - 'plugin_downloading' => 'Downloading plugin: :name', - 'plugin_extracting' => 'Unpacking plugin: :name', - 'plugin_version_none' => 'New plugin', + 'core_build' => 'Version actuelle', + 'core_build_old' => 'Version actuelle :build', + 'core_build_new' => 'Version :build', + 'core_build_new_help' => 'Une nouvelle version est disponible.', + 'core_downloading' => 'Téléchargement des ficiers de l\'application', + 'core_extracting' => 'Décompression des fichiers de l\'application', + 'plugin_downloading' => 'Téléchargement du plugin : :name', + 'plugin_extracting' => 'Décompression du plugin : :name', + 'plugin_version_none' => 'Nouveau plugin', 'plugin_version_old' => 'Actuelle v:version', 'plugin_version_new' => 'v:version', 'theme_label' => 'Thème', 'theme_new_install' => 'Installation du nouveau thème.', - 'theme_downloading' => 'Téléchargement du thème: :name', - 'theme_extracting' => 'Décompression du thème: :name', - 'update_label' => 'Update software', + 'theme_downloading' => 'Téléchargement du thème : :name', + 'theme_extracting' => 'Décompression du thème : :name', + 'update_label' => 'Mettre à jour', 'update_completing' => 'Finalisation du processus de mise à jour', - 'update_loading' => 'Loading available updates...', + 'update_loading' => 'Chargement des mises à jour disponibles...', 'update_success' => 'Mise à jour terminée avec succès.', 'update_failed_label' => 'Echec de la mise à jour', - 'force_label' => 'Forcé la mise à jour', + 'force_label' => 'Forcer la mise à jour', 'found' => [ 'label' => 'Nouvelle mise à jour disponible!', - 'help' => 'Click Update software to begin the update process.', + 'help' => 'Cliquez sur Mettre à jour pour démarrer le processus.', ], 'none' => [ 'label' => 'Aucune mise à jour disponible.', @@ -178,13 +178,13 @@ return [ 'extract_failed' => "Impossible de décompresser le fichier ':file'.", ], 'event_log' => [ - 'hint' => 'This log displays a list of potential errors that occur in the application, such as exceptions and debugging information.', - 'menu_label' => 'Log des événements', + 'hint' => 'Ce journal affiche une liste des erreurs potentielles dans l\'application, telle que des exceptions et des informations de déboggage.', + 'menu_label' => 'Journal des événements', 'menu_description' => 'Affiche les événements du système avec la date et details.', - 'empty_link' => 'Purger le log des événements', - 'empty_loading' => 'Emptying event log...', - 'empty_success' => 'Successfully emptied the event log.', - 'return_link' => 'Retour au log événements', + 'empty_link' => 'Vider le journal des événements', + 'empty_loading' => 'Vidage du journal des évènements...', + 'empty_success' => 'Le journal des évènement a été vidé avec succès.', + 'return_link' => 'Retour au journal des événements', 'id' => 'ID', 'id_label' => 'événement ID', 'created_at' => 'Date & heure', @@ -192,13 +192,13 @@ return [ 'level' => 'Level', ], 'request_log' => [ - 'hint' => 'This log displays a list of browser requests that may require attention. For example, if a visitor opens a CMS page that cannot be found, a record is created with the status code 404.', - 'menu_label' => 'Log des requêtes', + 'hint' => 'Ce journal affiche une liste de requêtes potentiellement suspectes. par exemple, si un visiteur ouvre une page de CMS introuvable, une ligne avec le status code 404 est alors crée.', + 'menu_label' => 'Journal des requêtes', 'menu_description' => 'Affiche les redirections et mauvaises requêtes, comme Page non trouvée(404).', - 'empty_link' => 'Purger le log des requêtes', - 'empty_loading' => 'Emptying request log...', - 'empty_success' => 'Successfully emptied the request log.', - 'return_link' => 'Retour au log des requêtes', + 'empty_link' => 'Vider le journal des requêtes', + 'empty_loading' => 'Vidage du journal des requêtes...', + 'empty_success' => 'Le journal des requêtes a été vidé avec succès.', + 'return_link' => 'Retour au journal des requêtes', 'id' => 'ID', 'id_label' => 'Log ID', 'count' => 'Compteur', diff --git a/modules/system/lang/ru/lang.php b/modules/system/lang/ru/lang.php index cadad8550..023578f31 100644 --- a/modules/system/lang/ru/lang.php +++ b/modules/system/lang/ru/lang.php @@ -14,6 +14,7 @@ return [ 'br' => 'Brazilian Portuguese', 'de' => 'German', 'ru' => 'Russian', + 'fr' => 'French', ], 'directory' => [ 'create_fail' => "Невозможно создать директорию: :name", From a1ba5e417803cfffea05c7374ab86500a6ff3288 Mon Sep 17 00:00:00 2001 From: sl1nk3 Date: Thu, 7 Aug 2014 00:31:40 -0400 Subject: [PATCH 03/39] Minor. --- modules/backend/models/EditorPreferences.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/backend/models/EditorPreferences.php b/modules/backend/models/EditorPreferences.php index 9d021ccd9..739fd6f26 100644 --- a/modules/backend/models/EditorPreferences.php +++ b/modules/backend/models/EditorPreferences.php @@ -65,6 +65,6 @@ class EditorPreferences extends Model // Sort the theme alphabetically, and push the default theme asort($themes); - return [static::DEFAULT_THEME => 'Twilight'] + $themes; + return [static::DEFAULT_THEME => ucwords(static::DEFAULT_THEME)] + $themes; } } \ No newline at end of file From 4b2602288871abf1d74955dd88241ae909a677cb Mon Sep 17 00:00:00 2001 From: sl1nk3 Date: Thu, 7 Aug 2014 00:38:31 -0400 Subject: [PATCH 04/39] Suppression de la contraction toute pas belle. --- modules/system/lang/fr/lang.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/system/lang/fr/lang.php b/modules/system/lang/fr/lang.php index e2d1edf57..a982c6bdb 100644 --- a/modules/system/lang/fr/lang.php +++ b/modules/system/lang/fr/lang.php @@ -88,13 +88,13 @@ return [ 'sendmail_path_comment' => 'Spécifiez le chemin du programme sendmail.', ], 'mail_templates' => [ - 'menu_label' => 'Modèles d\'Email', - 'menu_description' => 'Gérer les modèles et layouts d\'Email envoyés par l\'administration.', + 'menu_label' => 'Modèles des emails', + 'menu_description' => 'Gérer les modèles et layouts des emails envoyés par l\'administration.', 'new_template' => 'Nouveau modèle', 'new_layout' => 'Nouveau Layout', 'template' => 'Modèle', 'templates' => 'Modèles', - 'menu_layouts_label' => 'Layouts d\'Email', + 'menu_layouts_label' => 'Layouts des emails', 'layout' => 'Layout', 'layouts' => 'Layouts', 'name' => 'Nom', From 1765060856a06c3e543e095b1569cbfdb07019db Mon Sep 17 00:00:00 2001 From: sl1nk3 Date: Thu, 7 Aug 2014 00:45:12 -0400 Subject: [PATCH 05/39] Some more updates --- modules/system/lang/fr/lang.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/system/lang/fr/lang.php b/modules/system/lang/fr/lang.php index a982c6bdb..4e5ae6378 100644 --- a/modules/system/lang/fr/lang.php +++ b/modules/system/lang/fr/lang.php @@ -51,7 +51,7 @@ return [ 'name' => 'Projet', 'owner_label' => 'Auteur', 'attach' => 'Attacher un projet', - 'detach' => 'Detacher le Projet', + 'detach' => 'Détacher le Projet', 'none' => 'Aucun', 'id' => [ 'label' => 'Projet ID', @@ -115,12 +115,12 @@ return [ 'project_label' => 'Attacher un project', 'plugin_label' => 'Installer un plugin', 'missing_plugin_name' => 'Merci de spécifier le nom d\'un Plugin à installer.', - 'install_completing' => 'Fin du processus d\'instalation', + 'install_completing' => 'Fin du processus d\'installation', 'install_success' => 'Le plugin a été installé avec succès.', ], 'updates' => [ 'title' => 'Gérer les mises à jour', - 'name' => 'Software update', + 'name' => 'Mise à jour', 'menu_label' => 'Mise à jour', 'menu_description' => 'Mise à jour du système, gestion et installation des plugins et thèmes.', 'check_label' => 'Vérifier les mises à jour', From 3fe76758900cba1c34e58eb61a8852a35dbe851c Mon Sep 17 00:00:00 2001 From: sl1nk3 Date: Thu, 7 Aug 2014 00:53:04 -0400 Subject: [PATCH 06/39] Better french description for the request log --- modules/system/lang/fr/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/system/lang/fr/lang.php b/modules/system/lang/fr/lang.php index 4e5ae6378..61f944b5c 100644 --- a/modules/system/lang/fr/lang.php +++ b/modules/system/lang/fr/lang.php @@ -194,7 +194,7 @@ return [ 'request_log' => [ 'hint' => 'Ce journal affiche une liste de requêtes potentiellement suspectes. par exemple, si un visiteur ouvre une page de CMS introuvable, une ligne avec le status code 404 est alors crée.', 'menu_label' => 'Journal des requêtes', - 'menu_description' => 'Affiche les redirections et mauvaises requêtes, comme Page non trouvée(404).', + 'menu_description' => 'Affiche les requêtes erronées ou redirigées, comme les erreurs 404.', 'empty_link' => 'Vider le journal des requêtes', 'empty_loading' => 'Vidage du journal des requêtes...', 'empty_success' => 'Le journal des requêtes a été vidé avec succès.', From 7fd9e267a9f732ac6b17bf9ad3c3ccfa363af2b6 Mon Sep 17 00:00:00 2001 From: felix Date: Thu, 7 Aug 2014 12:58:17 +0400 Subject: [PATCH 07/39] add Translation to backend switch relation create_button relation add_button --- .../behaviors/relationcontroller/partials/_button_add.htm | 2 +- .../behaviors/relationcontroller/partials/_button_create.htm | 2 +- modules/backend/widgets/form/partials/_field_switch.htm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/backend/behaviors/relationcontroller/partials/_button_add.htm b/modules/backend/behaviors/relationcontroller/partials/_button_add.htm index 9247d6539..9bb10e3b5 100644 --- a/modules/backend/behaviors/relationcontroller/partials/_button_add.htm +++ b/modules/backend/behaviors/relationcontroller/partials/_button_add.htm @@ -3,5 +3,5 @@ data-handler="onRelationManageForm" href="javascript:;" class="btn btn-sm btn-primary oc-icon-plus"> - $relationLabel]) ?> + e(trans($relationLabel))]) ?> diff --git a/modules/backend/behaviors/relationcontroller/partials/_button_create.htm b/modules/backend/behaviors/relationcontroller/partials/_button_create.htm index f7a455559..f7072e2cf 100644 --- a/modules/backend/behaviors/relationcontroller/partials/_button_create.htm +++ b/modules/backend/behaviors/relationcontroller/partials/_button_create.htm @@ -3,5 +3,5 @@ data-handler="onRelationManageForm" href="javascript:;" class="btn btn-sm btn-primary oc-icon-plus"> - $relationLabel]) ?> + e(trans($relationLabel))]) ?> diff --git a/modules/backend/widgets/form/partials/_field_switch.htm b/modules/backend/widgets/form/partials/_field_switch.htm index e0f4ff23c..28e8bca6d 100644 --- a/modules/backend/widgets/form/partials/_field_switch.htm +++ b/modules/backend/widgets/form/partials/_field_switch.htm @@ -1,6 +1,6 @@
- + comment): ?>

comment)) ?>

From f21eaf05a3a3d0750f7ccdcbc014f05251a5e4b1 Mon Sep 17 00:00:00 2001 From: Sam Georges Date: Thu, 7 Aug 2014 20:42:39 +1000 Subject: [PATCH 08/39] Minor --- .../behaviors/relationcontroller/partials/_button_add.htm | 2 +- .../behaviors/relationcontroller/partials/_button_create.htm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/backend/behaviors/relationcontroller/partials/_button_add.htm b/modules/backend/behaviors/relationcontroller/partials/_button_add.htm index 9bb10e3b5..65f0640c3 100644 --- a/modules/backend/behaviors/relationcontroller/partials/_button_add.htm +++ b/modules/backend/behaviors/relationcontroller/partials/_button_add.htm @@ -3,5 +3,5 @@ data-handler="onRelationManageForm" href="javascript:;" class="btn btn-sm btn-primary oc-icon-plus"> - e(trans($relationLabel))]) ?> + trans($relationLabel)])) ?> diff --git a/modules/backend/behaviors/relationcontroller/partials/_button_create.htm b/modules/backend/behaviors/relationcontroller/partials/_button_create.htm index f7072e2cf..77ada5bbe 100644 --- a/modules/backend/behaviors/relationcontroller/partials/_button_create.htm +++ b/modules/backend/behaviors/relationcontroller/partials/_button_create.htm @@ -3,5 +3,5 @@ data-handler="onRelationManageForm" href="javascript:;" class="btn btn-sm btn-primary oc-icon-plus"> - e(trans($relationLabel))]) ?> + trans($relationLabel)])) ?> From 3fe08dfaf4d787d6a37ca4f824a447c50f742ac5 Mon Sep 17 00:00:00 2001 From: Sam Georges Date: Fri, 8 Aug 2014 22:02:46 +1000 Subject: [PATCH 09/39] Minor fix --- modules/backend/classes/BackendController.php | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/modules/backend/classes/BackendController.php b/modules/backend/classes/BackendController.php index 41537477c..03942a713 100644 --- a/modules/backend/classes/BackendController.php +++ b/modules/backend/classes/BackendController.php @@ -43,7 +43,7 @@ class BackendController extends ControllerBase */ $module = isset($params[0]) ? $params[0] : 'backend'; $controller = isset($params[1]) ? $params[1] : 'index'; - self::$action = $action = isset($params[2]) ? camel_case($params[2]) : 'index'; + self::$action = $action = isset($params[2]) ? $this->parseAction($params[2]) : 'index'; self::$params = $controllerParams = array_slice($params, 3); $controllerClass = '\\'.$module.'\Controllers\\'.$controller; if ($controllerObj = $this->findController($controllerClass, $action, '/modules')) @@ -55,7 +55,7 @@ class BackendController extends ControllerBase if (count($params) >= 2) { list($author, $plugin) = $params; $controller = isset($params[2]) ? $params[2] : 'index'; - self::$action = $action = isset($params[3]) ? camel_case($params[3]) : 'index'; + self::$action = $action = isset($params[3]) ? $this->parseAction($params[3]) : 'index'; self::$params = $controllerParams = array_slice($params, 4); $controllerClass = '\\'.$author.'\\'.$plugin.'\Controllers\\'.$controller; if ($controllerObj = $this->findController($controllerClass, $action, Config::get('cms.pluginsDir', '/plugins'))) @@ -97,4 +97,17 @@ class BackendController extends ControllerBase return false; } + + /** + * Process the action name, since dashes are not supported in PHP methods. + * @param string $actionName + * @return string + */ + protected function parseAction($actionName) + { + if (strpos($actionName, '-') !== false) + return camel_case($actionName); + + return $actionName; + } } \ No newline at end of file From c1856dfbe2b25160c86ad67396fcfcad3726eaa2 Mon Sep 17 00:00:00 2001 From: Paul Wilde Date: Fri, 8 Aug 2014 21:41:32 +0100 Subject: [PATCH 10/39] Translate My Settings heading. --- modules/system/controllers/settings/mysettings.htm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/system/controllers/settings/mysettings.htm b/modules/system/controllers/settings/mysettings.htm index 32d8c0220..cb63249ad 100644 --- a/modules/system/controllers/settings/mysettings.htm +++ b/modules/system/controllers/settings/mysettings.htm @@ -3,7 +3,7 @@ $items): ?>
-

+

From de984511483ad24142ff28fe9f716f17b5bb6be3 Mon Sep 17 00:00:00 2001 From: Paul Wilde Date: Sat, 9 Aug 2014 01:29:19 +0100 Subject: [PATCH 11/39] Allow the dashboard widget inspector and report widget to be translated. --- modules/backend/lang/en/lang.php | 15 +++++++++ modules/backend/widgets/ReportContainer.php | 31 ++++++++++--------- .../reportcontainer/partials/_widget.htm | 4 +-- modules/system/reportwidgets/Status.php | 7 +++-- .../reportwidgets/status/partials/_widget.htm | 6 ++-- 5 files changed, 41 insertions(+), 22 deletions(-) diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php index 5bbaff5e5..8dfde181e 100644 --- a/modules/backend/lang/en/lang.php +++ b/modules/backend/lang/en/lang.php @@ -48,6 +48,21 @@ return [ 'widget_label' => 'Widget', 'widget_width' => 'Width', 'add_widget' => 'Add widget', + 'widget_inspector_title' => 'Widget configuration', + 'widget_inspector_description' => 'Configure the report widget', + 'widget_columns_label' => 'Width :columns', + 'widget_columns_description' => 'The widget width, a number between 1 and 10.', + 'widget_columns_error' => 'Please enter the widget width as a number between 1 and 10.', + 'columns' => '{1} column|[2,Inf] columns', + 'widget_new_row_label' => 'Force new row', + 'widget_new_row_description' => 'Put the widget in a new row.', + 'widget_title_label' => 'Widget title', + 'widget_title_error' => 'The Widget Title is required.', + 'status' => [ + 'widget_title_default' => 'System status', + 'online' => 'online', + 'update_available' => '{0} updates available!|{1} update available!|[2,Inf] updates available!', + ] ], 'user' => [ 'name' => 'Administrator', diff --git a/modules/backend/widgets/ReportContainer.php b/modules/backend/widgets/ReportContainer.php index 61bd8e94d..5dc8eb8b9 100644 --- a/modules/backend/widgets/ReportContainer.php +++ b/modules/backend/widgets/ReportContainer.php @@ -6,6 +6,7 @@ use Request; use Backend\Classes\WidgetManager; use Backend\Models\UserPreferences; use File; +use Lang; /** * Report Container Widget @@ -282,30 +283,30 @@ class ReportContainer extends WidgetBase $property = [ 'property' => 'ocWidgetWidth', - 'title' => 'Width (1-10)', - 'description' => 'The widget width, a number between 1 and 10.', + 'title' => Lang::get('backend::lang.dashboard.widget_columns_label', ['columns' => '(1-10)']), + 'description' => Lang::get('backend::lang.dashboard.widget_columns_description'), 'type' => 'dropdown', 'validationPattern' => '^[0-9]+$', - 'validationMessage' => 'Please enter the widget width as a number between 1 and 10.', + 'validationMessage' => Lang::get('backend::lang.dashboard.widget_columns_error'), 'options' => [ - 1 => '1 column', - 2 => '2 columns', - 3 => '3 columns', - 4 => '4 columns', - 5 => '5 columns', - 6 => '6 columns', - 7 => '7 columns', - 8 => '8 columns', - 9 => '9 columns', - 10 => '10 columns' + 1 => '1 ' . Lang::choice('backend::lang.dashboard.columns', 1), + 2 => '2 ' . Lang::choice('backend::lang.dashboard.columns', 2), + 3 => '3 ' . Lang::choice('backend::lang.dashboard.columns', 3), + 4 => '4 ' . Lang::choice('backend::lang.dashboard.columns', 4), + 5 => '5 ' . Lang::choice('backend::lang.dashboard.columns', 5), + 6 => '6 ' . Lang::choice('backend::lang.dashboard.columns', 6), + 7 => '7 ' . Lang::choice('backend::lang.dashboard.columns', 7), + 8 => '8 ' . Lang::choice('backend::lang.dashboard.columns', 8), + 9 => '9 ' . Lang::choice('backend::lang.dashboard.columns', 9), + 10 => '10 ' . Lang::choice('backend::lang.dashboard.columns', 10) ] ]; $result[] = $property; $property = [ 'property' => 'ocWidgetNewRow', - 'title' => 'Force new row', - 'description' => 'Put the widget in a new row.', + 'title' => Lang::get('backend::lang.dashboard.widget_new_row_label'), + 'description' => Lang::get('backend::lang.dashboard.widget_new_row_description'), 'type' => 'checkbox' ]; diff --git a/modules/backend/widgets/reportcontainer/partials/_widget.htm b/modules/backend/widgets/reportcontainer/partials/_widget.htm index 14cfb8a1f..f345bcbfb 100644 --- a/modules/backend/widgets/reportcontainer/partials/_widget.htm +++ b/modules/backend/widgets/reportcontainer/partials/_widget.htm @@ -11,8 +11,8 @@ [ - 'title' => 'Widget title', - 'default' => 'System status', + 'title' => Lang::get('backend::lang.dashboard.widget_title_label'), + 'default' => Lang::get('backend::lang.dashboard.status.widget_title_default'), 'type' => 'string', 'validationPattern' => '^.+$', - 'validationMessage' => 'The Widget Title is required.' + 'validationMessage' => Lang::get('backend::lang.dashboard.widget_title_error') ] ]; } diff --git a/modules/system/reportwidgets/status/partials/_widget.htm b/modules/system/reportwidgets/status/partials/_widget.htm index f29960443..90f24d1dd 100644 --- a/modules/system/reportwidgets/status/partials/_widget.htm +++ b/modules/system/reportwidgets/status/partials/_widget.htm @@ -4,11 +4,13 @@ From 906370c6bdfbcc923013a7ca848ed71e12455d26 Mon Sep 17 00:00:00 2001 From: Paul Wilde Date: Sat, 9 Aug 2014 03:02:15 +0100 Subject: [PATCH 12/39] Added translation strings for permission labels, mail template/layout column labels, editor fullscreen, list pagination and list setup modal. --- modules/backend/ServiceProvider.php | 4 ++-- .../codeeditor/partials/_codeeditor.htm | 4 ++-- modules/backend/lang/en/lang.php | 7 +++++++ .../widgets/lists/partials/_list_pagination.htm | 4 +++- .../widgets/lists/partials/_setup_form.htm | 16 ++++++---------- modules/cms/ServiceProvider.php | 12 ++++++------ modules/cms/lang/en/lang.php | 12 +++++++++++- modules/system/ServiceProvider.php | 6 +++--- modules/system/lang/en/lang.php | 7 +++++++ modules/system/models/maillayout/columns.yaml | 4 ++-- modules/system/models/mailtemplate/columns.yaml | 7 ++++--- 11 files changed, 53 insertions(+), 30 deletions(-) diff --git a/modules/backend/ServiceProvider.php b/modules/backend/ServiceProvider.php index 5bed5d86b..0ee23b327 100644 --- a/modules/backend/ServiceProvider.php +++ b/modules/backend/ServiceProvider.php @@ -121,8 +121,8 @@ class ServiceProvider extends ModuleServiceProvider */ BackendAuth::registerCallback(function($manager) { $manager->registerPermissions('October.Backend', [ - 'backend.access_dashboard' => ['label' => 'View the dashboard', 'tab' => 'System'], - 'backend.manage_users' => ['label' => 'Manage other administrators', 'tab' => 'System'], + 'backend.access_dashboard' => ['label' => 'system::lang.permissions.view_the_dashboard', 'tab' => 'System'], + 'backend.manage_users' => ['label' => 'system::lang.permissions.manage_other_administrators', 'tab' => 'System'], ]); }); diff --git a/modules/backend/formwidgets/codeeditor/partials/_codeeditor.htm b/modules/backend/formwidgets/codeeditor/partials/_codeeditor.htm index 82001334a..fbfe2bf5d 100644 --- a/modules/backend/formwidgets/codeeditor/partials/_codeeditor.htm +++ b/modules/backend/formwidgets/codeeditor/partials/_codeeditor.htm @@ -22,13 +22,13 @@
  • - Enter fullscreen mode +
  • - Exit fullscreen mode +
    • diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php index 8dfde181e..87a0ee60b 100644 --- a/modules/backend/lang/en/lang.php +++ b/modules/backend/lang/en/lang.php @@ -109,6 +109,13 @@ return [ 'missing_definition' => "List behavior does not contain a column for ':field'.", 'behavior_not_ready' => 'List behavior has not been initialized, check that you have called makeLists() in your controller.', 'invalid_column_datetime' => "Column value ':column' is not a DateTime object, are you missing a \$dates reference in the Model?", + 'pagination' => 'Displayed records: :from-:to of :total', + 'setup_title' => 'List Setup', + 'setup_help' => 'Use checkboxes to select columns you want to see in the list. You can change position of columns by dragging them up or down.', + 'records_per_page' => 'Records per page', + 'records_per_page_help' => 'Select the number of records per page to display. Please note that high number of records on a single page can reduce performance.', + 'apply_changes' => 'Apply changes', + 'cancel' => 'Cancel' ], 'form' => [ 'create_title' => "New :name", diff --git a/modules/backend/widgets/lists/partials/_list_pagination.htm b/modules/backend/widgets/lists/partials/_list_pagination.htm index fa7c2a22d..4ff7f0f66 100644 --- a/modules/backend/widgets/lists/partials/_list_pagination.htm +++ b/modules/backend/widgets/lists/partials/_list_pagination.htm @@ -1,6 +1,8 @@
    - Displayed records: - of + + $pageFrom, 'to' => $pageTo, 'total' => $recordTotal])) ?> + 1): ?>
    -

    List Setup

    +

    -

    - Use checkboxes to select columns you want to see in the list. - You can change position of columns by dragging them up or down. -

    +

    diff --git a/modules/cms/widgets/assetlist/partials/_new_dir_form.htm b/modules/cms/widgets/assetlist/partials/_new_dir_form.htm index 3b73cac53..b6a95f170 100644 --- a/modules/cms/widgets/assetlist/partials/_new_dir_form.htm +++ b/modules/cms/widgets/assetlist/partials/_new_dir_form.htm @@ -6,11 +6,11 @@ ]) ?>
    -

    New directory

    +

    - +
    @@ -21,13 +21,13 @@ type="submit" class="btn btn-primary" > - Create +
    - - - diff --git a/modules/backend/widgets/filter/partials/_scope_checkbox.htm b/modules/backend/widgets/filter/partials/_scope_checkbox.htm index 835f93ad4..d9ce4fe87 100644 --- a/modules/backend/widgets/filter/partials/_scope_checkbox.htm +++ b/modules/backend/widgets/filter/partials/_scope_checkbox.htm @@ -2,6 +2,6 @@
    - + value ? 'checked' : '' ?> />
    From 3ff31f21805229a124a8ba799e52095dcd7abec0 Mon Sep 17 00:00:00 2001 From: Sam Georges Date: Wed, 13 Aug 2014 21:25:57 +1000 Subject: [PATCH 38/39] Minor --- modules/cms/classes/Controller.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php index bf123a034..32d8f3dc4 100644 --- a/modules/cms/classes/Controller.php +++ b/modules/cms/classes/Controller.php @@ -266,7 +266,6 @@ class Controller extends BaseController /** * Returns the Twig environment. - * * @return Twig_Environment */ public function getTwig() @@ -276,6 +275,7 @@ class Controller extends BaseController /** * Initializes the custom layout and page objects. + * @return void */ protected function initCustomObjects() { @@ -296,6 +296,7 @@ class Controller extends BaseController /** * Initializes the components for the layout and page. + * @return void */ protected function initComponents() { From bf1247e197d4e2d3d153796adbcb102b12e80cd8 Mon Sep 17 00:00:00 2001 From: Nicola Marini Date: Wed, 13 Aug 2014 17:42:51 +0200 Subject: [PATCH 39/39] Fix issue when searching an asset in CMS backend On Windows, searching for a file return the paths with the "\" separator, and throws an error when selecting a file for editing. --- modules/cms/widgets/AssetList.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/cms/widgets/AssetList.php b/modules/cms/widgets/AssetList.php index 97c5c4917..e9eb20127 100644 --- a/modules/cms/widgets/AssetList.php +++ b/modules/cms/widgets/AssetList.php @@ -640,7 +640,7 @@ class AssetList extends WidgetBase if ($this->pathMatchesSearch($words, $path)) { $result[] = (object)[ 'type'=>'file', - 'path'=>$path, + 'path'=>File::normalizePath($path), 'name'=>$item->getFilename(), 'editable'=>in_array(strtolower($item->getExtension()), $editableAssetTypes) ]; @@ -664,4 +664,4 @@ class AssetList extends WidgetBase return true; } -} \ No newline at end of file +}