Updated Backend + System language support

Moved hard-coded text in "backend" and "system" to the language files
(English and Dutch). Affected pages: administrator management,
administrator group management, system updates, system settings, email
settings. Also made some strings more generic for general use (like
"Saving...." instead of "Saving administrator account...")

modules/backend/controllers/groups/create.htm

@@ -19,7 +19,7 @@
                     data-request="onSave"
                     data-hotkey="ctrl+s"
                     data-hotkey-mac="cmd+s"
-                    data-load-indicator="<?= e(trans('backend::lang.user.group.creating')) ?>"
+                    data-load-indicator="<?= e(trans('backend::lang.form.creating')) ?>"
                     class="btn btn-primary">
                     <?= e(trans('backend::lang.form.create')) ?>
                 </button>
@@ -29,7 +29,7 @@
                     data-request-data="close:1"
                     data-hotkey="ctrl+s"
                     data-hotkey-mac="cmd+s"
-                    data-load-indicator="<?= e(trans('backend::lang.user.group.creating')) ?>"
+                    data-load-indicator="<?= e(trans('backend::lang.form.creating')) ?>"
                     class="btn btn-default">
                     <?= e(trans('backend::lang.form.create_and_close')) ?>
                 </button>

modules/backend/controllers/groups/update.htm

@@ -20,7 +20,7 @@
                     data-request-data="redirect:0"
                     data-hotkey="ctrl+s"
                     data-hotkey-mac="cmd+s"
-                    data-load-indicator="<?= e(trans('backend::lang.user.group.saving')) ?>"
+                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
                     class="btn btn-primary">
                     <?= e(trans('backend::lang.form.save')) ?>
                 </button>
@@ -30,7 +30,7 @@
                     data-request-data="close:1"
                     data-hotkey="ctrl+enter"
                     data-hotkey-mac="cmd+enter"
-                    data-load-indicator="<?= e(trans('backend::lang.user.group.saving')) ?>"
+                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
                     class="btn btn-default">
                     <?= e(trans('backend::lang.form.save_and_close')) ?>
                 </button>
@@ -38,8 +38,8 @@
                     type="button"
                     class="btn btn-danger pull-right"
                     data-request="onDelete"
-                    data-load-indicator="<?= e(trans('backend::lang.user.group.deleting')) ?>"
+                    data-load-indicator="<?= e(trans('backend::lang.form.deleting')) ?>"
-                    data-request-confirm="Do you really want to delete this admin?">
+                    data-request-confirm="<?= e(trans('backend::lang.user.group.delete_confirm')) ?>">
                     <?= e(trans('backend::lang.form.delete')) ?>
                 </button>
             </div>

modules/backend/controllers/users/create.htm

@@ -19,7 +19,7 @@
                     data-request="onSave"
                     data-hotkey="ctrl+s"
                     data-hotkey-mac="cmd+s"
-                    data-load-indicator="<?= e(trans('backend::lang.user.creating')) ?>"
+                    data-load-indicator="<?= e(trans('backend::lang.form.creating')) ?>"
                     class="btn btn-primary">
                     <?= e(trans('backend::lang.form.create')) ?>
                 </button>
@@ -29,7 +29,7 @@
                     data-request-data="close:1"
                     data-hotkey="ctrl+enter"
                     data-hotkey-mac="cmd+enter"
-                    data-load-indicator="<?= e(trans('backend::lang.user.creating')) ?>"
+                    data-load-indicator="<?= e(trans('backend::lang.form.creating')) ?>"
                     class="btn btn-default">
                     <?= e(trans('backend::lang.form.create_and_close')) ?>
                 </button>

modules/backend/controllers/users/mysettings.htm

@@ -20,7 +20,7 @@
                     data-request-data="redirect:0"
                     data-hotkey="ctrl+s"
                     data-hotkey-mac="cmd+s"
-                    data-load-indicator="<?= e(trans('backend::lang.user.saving')) ?>"
+                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
                     class="btn btn-primary">
                     <?= e(trans('backend::lang.form.save')) ?>
                 </button>
@@ -30,7 +30,7 @@
                     data-request-data="close:1"
                     data-hotkey="ctrl+enter"
                     data-hotkey-mac="cmd+enter"
-                    data-load-indicator="<?= e(trans('backend::lang.user.saving')) ?>"
+                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
                     class="btn btn-default">
                     <?= e(trans('backend::lang.form.save_and_close')) ?>
                 </button>

modules/backend/controllers/users/update.htm

@@ -20,7 +20,7 @@
                     data-request-data="redirect:0"
                     data-hotkey="ctrl+s"
                     data-hotkey-mac="cmd+s"
-                    data-load-indicator="<?= e(trans('backend::lang.user.saving')) ?>"
+                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
                     class="btn btn-primary">
                     <?= e(trans('backend::lang.form.save')) ?>
                 </button>
@@ -30,7 +30,7 @@
                     data-request-data="close:1"
                     data-hotkey="ctrl+enter"
                     data-hotkey-mac="cmd+enter"
-                    data-load-indicator="<?= e(trans('backend::lang.user.saving')) ?>"
+                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
                     class="btn btn-default">
                     <?= e(trans('backend::lang.form.save_and_close')) ?>
                 </button>
@@ -41,7 +41,7 @@
                     type="button"
                     class="oc-icon-trash-o btn-icon danger pull-right"
                     data-request="onDelete"
-                    data-load-indicator="<?= e(trans('backend::lang.user.deleting')) ?>"
+                    data-load-indicator="<?= e(trans('backend::lang.form.deleting')) ?>"
                     data-request-confirm="<?= e(trans('backend::lang.user.delete_confirm')) ?>">
                 </button>
             </div>

modules/backend/lang/en/lang.php

@@ -60,9 +60,6 @@ return [
         'superuser_comment' => "Check this box to allow this person to access all areas.",
         'send_invite' => 'Send invitation by email',
         'send_invite_comment' => 'Use this checkbox to send an invitation to the user by email',
-        'creating' => 'Creating Administrator...',
-        'saving' => 'Saving Administrator...',
-        'deleting' => 'Deleting Administrator...',
         'delete_confirm' => 'Do you really want to delete this administrator?',
         'return' => 'Return to the administrator list',
         'group' => [
@@ -71,9 +68,7 @@ return [
             'menu_label' => 'Groups',
             'list_title' => 'Manage Groups',
             'new' => 'New Administrator Group',
-            'creating' => 'Creating Group...',
+            'delete_confirm' => 'Do you really want to delete this administrator group?',
-            'saving' => 'Saving Group...',
-            'deleting' => 'Deleting Group...',
             'return' => 'Return to the group list',
         ],
         'preferences' => [
@@ -103,16 +98,18 @@ return [
         'not_found' => 'Form record with an ID of :id could not be found.',
         'create' => 'Create',
         'create_and_close' => 'Create and close',
+        'creating' => 'Creating...',
         'save' => 'Save',
         'save_and_close' => 'Save and close',
         'saving' => 'Saving...',
+        'delete' => 'Delete',
+        'deleting' => 'Deleting...',
         'undefined_tab' => 'Misc',
         'field_off' => 'Off',
         'field_on' => 'On',
         'apply' => 'Apply',
         'cancel' => 'Cancel',
         'close' => 'Close',
-        'delete' => 'Delete',
         'ok' => 'OK',
         'or' => 'or',
         'confirm_tab_close' => 'Do you really want to close the tab? Unsaved changes will be lost.',

modules/backend/lang/nl/lang.php

@@ -60,9 +60,6 @@ return [
         'superuser_comment' => "Vink deze optie aan om de gebruiker volledige rechten tot het systeem te geven.",
         'send_invite' => 'Stuur uitnodiging per e-mail',
         'send_invite_comment' => 'Vink deze optie aan om de gebruiker een uitnodiging per e-mail te sturen',
-        'creating' => 'Administrator aanmaken...',
-        'saving' => 'Administrator opslaan...',
-        'deleting' => 'Groep verwijderen...',
         'delete_confirm' => 'Weet je zeker dat je deze beheerder wilt verwijderen?',
         'return' => 'Terug naar beheerdersoverzicht',
         'group' => [
@@ -71,9 +68,7 @@ return [
             'menu_label' => 'Groepen',
             'list_title' => 'Beheer Groepen',
             'new' => 'Nieuwe Beheerdersgroep',
-            'creating' => 'Groep aanmaken...',
+            'delete_confirm' => 'Weet je zeker dat je deze beheerdersgroep wilt verwijderen?',
-            'saving' => 'Groep opslaan...',
-            'deleting' => 'Groep verwijderen...',
             'return' => 'Terug naar groepenoverzicht',
         ],
         'preferences' => [
@@ -103,16 +98,18 @@ return [
         'not_found' => 'Het formulier met record ID :id is niet gevonden.',
         'create' => 'Maken',
         'create_and_close' => 'Maken en sluiten',
+        'creating' => 'Maken...',
         'save' => 'Opslaan',
         'save_and_close' => 'Opslaan en sluiten',
         'saving' => 'Opslaan...',
+        'delete' => 'Verwijderen',
+        'deleting' => 'Verwijderen...',
         'undefined_tab' => 'Overig',
         'field_off' => 'Uit',
         'field_on' => 'Aan',
         'apply' => 'Toepassen',
         'cancel' => 'Annuleren',
         'close' => 'Sluiten',
-        'delete' => 'Verwijderen',
         'ok' => 'OK',
         'or' => 'of',
         'confirm_tab_close' => 'Weet je zeker dat je dit tabblad wilt sluiten? Niet opgeslagen wijzigingen gaan verloren.',

modules/system/ServiceProvider.php

@@ -155,8 +155,8 @@ class ServiceProvider extends ModuleServiceProvider
         SettingsManager::instance()->registerCallback(function($manager){
             $manager->registerSettingItems('October.System', [
                 'email' => [
-                    'label'       => 'Email Configuration',
+                    'label'       => 'system::lang.email.menu_label',
-                    'description' => 'Manage email configuration.',
+                    'description' => 'system::lang.email.menu_description',
                     'category'    => 'System',
                     'icon'        => 'icon-envelope',
                     'class'       => 'System\Models\EmailSettings',

modules/system/controllers/Settings.php

@@ -73,7 +73,7 @@ class Settings extends Controller
         }
         $model->save(null, $this->formWidget->getSessionKey());
 
-        Flash::success(Lang::get('system::lang.settings.update_success', ['name'=>$item->label]));
+        Flash::success(Lang::get('system::lang.settings.update_success', ['name' => Lang::get($item->label)]));
 
         if ($redirect = Backend::Url('system/settings'))
             return Redirect::to($redirect);

modules/system/controllers/settings/index.htm

@@ -12,8 +12,8 @@
                 <div class="settings-item col-xs-12 col-sm-6 col-md-4">
                     <a href="<?= $item->url ?>">
                         <div class="item-icon"><i class="<?= $item->icon ?>"></i></div>
-                        <h5><?= $item->label ?></h5>
+                        <h5><?= e(trans($item->label)) ?></h5>
-                        <p><?= $item->description ?></p>
+                        <p><?= e(trans($item->description)) ?></p>
                     </a>
                 </div>
             <?php endforeach ?>

modules/system/controllers/settings/update.htm

@@ -1,6 +1,6 @@
 <?php Block::put('breadcrumb') ?>
     <ul>
-        <li><a href="<?= Backend::url('system/settings') ?>">Settings</a></li>
+        <li><a href="<?= Backend::url('system/settings') ?>"><?= e(trans('system::lang.settings.menu_label')) ?></a></li>
         <li><?= e($this->pageTitle) ?></li>
     </ul>
 <?php Block::endPut() ?>
@@ -19,13 +19,13 @@
                     data-request-data="redirect:0"
                     data-hotkey="ctrl+s"
                     data-hotkey-mac="cmd+s"
-                    data-load-indicator="Saving..."
+                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
                     class="btn btn-primary">
-                    <u>S</u>ave settings
+                    <?= e(trans('backend::lang.form.save')) ?>
                 </button>
 
                 <span class="btn-text">
-                    or <a href="<?= Backend::url('system/settings') ?>">Cancel</a>
+                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('system/settings') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
                 </span>
             </div>
         </div>
@@ -33,5 +33,5 @@
 
 <?php else: ?>
     <p class="flash-message static error"><?= e($this->fatalError) ?></p>
-    <p><a href="<?= Backend::url('system/settings') ?>" class="btn btn-default">Return to system settings</a></p>
+    <p><a href="<?= Backend::url('system/settings') ?>" class="btn btn-default"><?= e(trans('system::lang.settings.return')) ?></a></p>
 <?php endif ?>

modules/system/controllers/updates/config_list.yaml

@@ -2,7 +2,7 @@
 #  List Behavior Config
 # ===================================
 
-title: Manage Updates
+title: system::lang.updates.title
 list: @/modules/system/models/pluginversion/columns.yaml
 modelClass: System\Models\PluginVersion
 noRecordsMessage: backend::lang.list.no_records

modules/system/controllers/updates/index.htm

@@ -10,16 +10,16 @@
                         href="javascript:;"
                         data-request-confirm="Are you sure?"
                         data-request="onDetachProject"
-                        data-stripe-load-indicator>detach</a>)
+                        data-stripe-load-indicator><?= e(trans('system::lang.project.detach_confirm')) ?></a>)
                 </p>
             <?php else: ?>
-                <p class="oc-icon-chain-broken">None</p>
+                <p class="oc-icon-chain-broken"><?= e(trans('system::lang.project.none')) ?></p>
                 <p class="description">
                     <a
                         href="javascript:;"
                         data-control="popup"
                         data-handler="onLoadProjectForm">
-                        Attach to Project
+                        <?= e(trans('system::lang.project.attach')) ?>
                     </a>
                 </p>
             <?php endif ?>

modules/system/lang/en/lang.php

@@ -25,17 +25,38 @@ return [
     'project' => [
         'name' => 'Project',
         'owner_label' => 'Owner',
+        'attach' => 'Attach Project',
+        'detach' => 'Detach Project',
+        'none' => 'None',
         'id' => [
             'label' => 'Project ID',
             'help' => 'How to find your Project ID',
             'missing' => 'Please specify a Project ID to use.',
         ],
+        'detach_confirm_' => 'Are you sure you want to detach this project?',
         'unbind_success' => 'Project has been detached successfully.',
     ],
     'settings' => [
         'menu_label' => 'Settings',
         'missing_model' => 'The settings page is missing a Model definition.',
         'update_success' => 'Settings for :name have been updated successfully.',
+        'return' => 'Return to system settings',
+    ],
+    'email' => [
+        'menu_label' => 'Email Configuration',
+        'menu_description' => 'Manage email configuration.',
+        'method' => 'Email Method',
+        'sender_name' => 'Sender Name',
+        'sender_email' => 'Sender Email',
+        'smtp_address' => 'SMTP Address',
+        'smtp_authorization' => 'SMTP authorization required',
+        'smtp_authorization_comment' => 'Use this checkbox if your SMTP server requires authorization.',
+        'smtp_username' => 'Username',
+        'smtp_password' => 'Password',
+        'smtp_port' => 'SMTP Port',
+        'smtp_ssl' => 'SSL connection required',
+        'sendmail_path' => 'Sendmail Path',
+        'sendmail_path_comment' => 'Please specify the path of the sendmail program.',
     ],
     'install' => [
         'project_label' => 'Attach to Project',
@@ -45,10 +66,15 @@ return [
         'install_success' => 'The plugin has been installed successfully.',
     ],
     'updates' => [
+        'title' => 'Manage Updates',
         'name' => 'Software update',
         'menu_label' => 'Updates',
         'check_label' => 'Check for updates',
         'retry_label' => 'Try again',
+        'plugin_name' => 'Name',
+        'plugin_description' => 'Description',
+        'plugin_version' => 'Version',
+        'plugin_author' => 'Author',
         'core_build' => 'Current build',
         'core_build_old' => 'Current build :build',
         'core_build_new' => 'Build :build',

modules/system/lang/nl/lang.php

@@ -25,17 +25,38 @@ return [
     'project' => [
         'name' => 'Project',
         'owner_label' => 'Eigenaar',
+        'attach' => 'Project Koppelen',
+        'detach' => 'Project Ontkoppelen',
+        'none' => 'Geen',
         'id' => [
             'label' => 'Project ID',
             'help' => 'Hoe vind je jouw Project ID',
             'missing' => 'Voer een Project ID in.',
         ],
-        'unbind_success' => 'Project is succesvol losgekoppeld.',
+        'detach_confirm_' => 'Are you sure you want to detach this project?',
+        'unbind_success' => 'Project is succesvol ontkoppeld.',
     ],
     'settings' => [
         'menu_label' => 'Instellingen',
         'missing_model' => 'De instellingenpagina mist de definitie van een Model.',
         'update_success' => 'Instellingen voor :name zijn succesvol bijgewerkt.',
+        'return' => 'Terug naar systeeminstellingen',
+    ],
+    'email' => [
+        'menu_label' => 'E-mailinstellingen',
+        'menu_description' => 'Beheer e-mailinstellingen.',
+        'method' => 'Email Methode',
+        'sender_name' => 'Naam Afzender',
+        'sender_email' => 'E-mailadres Afzender',
+        'smtp_address' => 'SMTP Adres',
+        'smtp_authorization' => 'SMTP authenticatie vereist',
+        'smtp_authorization_comment' => 'Vink deze optie aan indien de SMTP server authenticatie vereist.',
+        'smtp_username' => 'Gebruikersnaam',
+        'smtp_password' => 'Wachtwoord',
+        'smtp_port' => 'SMTP Poort',
+        'smtp_ssl' => 'SSL verbinding vereist',
+        'sendmail_path' => 'Pad naar Sendmail',
+        'sendmail_path_comment' => 'Geef hier het volledige pad op naar de Sendmail-applicatie.',
     ],
     'install' => [
         'project_label' => 'Koppel aan Project',
@@ -45,10 +66,15 @@ return [
         'install_success' => 'De plugin is succesvol geïnstalleerd.',
     ],
     'updates' => [
+        'title' => 'Beheer Updates',
         'name' => 'Applicatie-update',
         'menu_label' => 'Updates',
         'check_label' => 'Controleer op updates',
         'retry_label' => 'Probeer nogmaals',
+        'plugin_name' => 'Naam',
+        'plugin_description' => 'Omschrijving',
+        'plugin_version' => 'Versie',
+        'plugin_author' => 'Auteur',
         'core_build' => 'Huidige build',
         'core_build_old' => 'Huidige build :build',
         'core_build_new' => 'Build :build',

modules/system/models/emailsettings/fields.yaml

@@ -6,50 +6,50 @@ tabs:
 
   fields:
     send_mode:
-      label: Email Method
+      label: system::lang.email.method
       type: dropdown
       tab: General
 
     sender_name:
-      label: Sender Name
+      label: system::lang.email.sender_name
       span: auto
       tab: General
 
     sender_email:
-      label: Sender Email
+      label: system::lang.email.sender_email
       span: auto
       tab: General
 
     smtp_address:
-      label: SMTP address
+      label: system::lang.email.smtp_address
       tab: SMTP
 
     smtp_authorization:
       type: checkbox
-      label: SMTP Authorization Required
+      label: system::lang.email.smtp_authorization
       tab: SMTP
-      comment: Use this checkbox if your SMTP server requires authorization.
+      comment: system::lang.email.smtp_authorization_comment
 
     smtp_user:
-      label: User
+      label: system::lang.email.smtp_username
       tab: SMTP
       span: left
 
     smtp_password:
-      label: Password
+      label: system::lang.email.smtp_password
       tab: SMTP
       span: right
 
     smtp_port:
-      label: SMTP Port
+      label: system::lang.email.smtp_port
       tab: SMTP
 
     smtp_ssl:
       type: checkbox
-      label: SSL connection required
+      label: system::lang.email.smtp_ssl
       tab: SMTP
 
     sendmail_path:
-      label: Sendmail path
+      label: system::lang.email.sendmail_path
-      commentAbove: Please specify the path of the sendmail program.
+      commentAbove: system::lang.email.sendmail_path_comment
       tab: Sendmail

modules/system/models/pluginversion/columns.yaml

@@ -5,17 +5,17 @@
 columns:
 
   name:
-    label: Name
+    label: system::lang.updates.plugin_name
     sortable: false
 
   description:
-    label: Description
+    label: system::lang.updates.plugin_description
     sortable: false
 
   version:
-    label: Version
+    label: system::lang.updates.plugin_version
     sortable: false
 
   author:
-    label: Author
+    label: system::lang.updates.plugin_author
     sortable: false