Moved hard-coded text to language file (backend)

Hard-coded text from the backend (user- and group management) moved to
the language file (English and Dutch).
This commit is contained in:
Jasper 2014-05-15 19:36:04 +02:00
parent bdff075058
commit 2e649d6b5f
10 changed files with 73 additions and 45 deletions

View File

@ -1,3 +1,3 @@
<div data-control="toolbar">
<a href="<?= Backend::url('backend/groups/create') ?>" class="btn btn-primary oc-icon-plus">New Admin Group</a>
<a href="<?= Backend::url('backend/groups/create') ?>" class="btn btn-primary oc-icon-plus"><?= e(trans('backend::lang.user.group.new')) ?></a>
</div>

View File

@ -1,7 +1,7 @@
<?php Block::put('breadcrumb') ?>
<ul>
<li><a href="<?= Backend::url('backend/users') ?>">System Administrators</a></li>
<li><a href="<?= Backend::url('backend/groups') ?>">Manage Groups</a></li>
<li><a href="<?= Backend::url('backend/users') ?>"><?= e(trans('backend::lang.user.menu_label')) ?></a></li>
<li><a href="<?= Backend::url('backend/groups') ?>"><?= e(trans('backend::lang.user.group.menu_label')) ?></a></li>
<li><?= e($this->pageTitle) ?></li>
</ul>
<?php Block::endPut() ?>
@ -19,9 +19,9 @@
data-request="onSave"
data-hotkey="ctrl+s"
data-hotkey-mac="cmd+s"
data-load-indicator="Creating Group..."
data-load-indicator="<?= e(trans('backend::lang.user.group.creating')) ?>"
class="btn btn-primary">
Create
<?= e(trans('backend::lang.form.create')) ?>
</button>
<button
type="button"
@ -29,9 +29,9 @@
data-request-data="close:1"
data-hotkey="ctrl+s"
data-hotkey-mac="cmd+s"
data-load-indicator="Creating Group..."
data-load-indicator="<?= e(trans('backend::lang.user.group.creating')) ?>"
class="btn btn-default">
Create and Close
<?= e(trans('backend::lang.form.create_and_close')) ?>
</button>
</div>
</div>
@ -40,5 +40,5 @@
<?php else: ?>
<p class="flash-message static error"><?= e($this->fatalError) ?></p>
<p><a href="<?= Backend::url('backend/groups') ?>" class="btn btn-default">Return to the group list</a></p>
<p><a href="<?= Backend::url('backend/groups') ?>" class="btn btn-default"><?= e(trans('backend::lang.user.group.return')) ?></a></p>
<?php endif ?>

View File

@ -1,8 +1,8 @@
<div class="control-breadcrumb">
<?php Block::put('breadcrumb') ?>
<ul>
<li><a href="<?= Backend::url('backend/users') ?>">System Administrators</a></li>
<li><a href="<?= Backend::url('backend/users') ?>"><?= e(trans('backend::lang.user.menu_label')) ?></a></li>
<li><?= e($this->pageTitle) ?></li>
</ul>
</div>
<?php Block::endPut() ?>
<?= $this->listRender() ?>

View File

@ -1,7 +1,7 @@
<?php Block::put('breadcrumb') ?>
<ul>
<li><a href="<?= Backend::url('backend/users') ?>">System Administrators</a></li>
<li><a href="<?= Backend::url('backend/groups') ?>">Manage Groups</a></li>
<li><a href="<?= Backend::url('backend/users') ?>"><?= e(trans('backend::lang.user.menu_label')) ?></a></li>
<li><a href="<?= Backend::url('backend/groups') ?>"><?= e(trans('backend::lang.user.group.menu_label')) ?></a></li>
<li><?= e($this->pageTitle) ?></li>
</ul>
<?php Block::endPut() ?>
@ -20,9 +20,9 @@
data-request-data="redirect:0"
data-hotkey="ctrl+s"
data-hotkey-mac="cmd+s"
data-load-indicator="Saving Group..."
data-load-indicator="<?= e(trans('backend::lang.user.group.saving')) ?>"
class="btn btn-primary">
<u>S</u>ave
<?= e(trans('backend::lang.form.save')) ?>
</button>
<button
type="button"
@ -30,17 +30,17 @@
data-request-data="close:1"
data-hotkey="ctrl+enter"
data-hotkey-mac="cmd+enter"
data-load-indicator="Saving Group..."
data-load-indicator="<?= e(trans('backend::lang.user.group.saving')) ?>"
class="btn btn-default">
Save and Close
<?= e(trans('backend::lang.form.save_and_close')) ?>
</button>
<button
type="button"
class="btn btn-danger pull-right"
data-request="onDelete"
data-load-indicator="Deleting Group..."
data-load-indicator="<?= e(trans('backend::lang.user.group.deleting')) ?>"
data-request-confirm="Do you really want to delete this admin?">
Delete
<?= e(trans('backend::lang.form.delete')) ?>
</button>
</div>
</div>
@ -49,5 +49,5 @@
<?php else: ?>
<p class="flash-message static error"><?= e($this->fatalError) ?></p>
<p><a href="<?= Backend::url('backend/groups') ?>" class="btn btn-default">Return to the group list</a></p>
<p><a href="<?= Backend::url('backend/groups') ?>" class="btn btn-default"><?= e(trans('backend::lang.user.group.return')) ?></a></p>
<?php endif ?>

View File

@ -1,6 +1,6 @@
<div data-control="toolbar">
<a href="<?= Backend::url('backend/users/create') ?>" class="btn btn-primary oc-icon-plus">New Admin</a>
<a href="<?= Backend::url('backend/groups') ?>" class="btn btn-default oc-icon-group">Manage Groups</a>
<a href="<?= Backend::url('backend/users/create') ?>" class="btn btn-primary oc-icon-plus"><?= e(trans('backend::lang.user.new')) ?></a>
<a href="<?= Backend::url('backend/groups') ?>" class="btn btn-default oc-icon-group"><?= e(trans('backend::lang.user.group.list_title')) ?></a>
<?php /* @todo
<div class="btn-group">
<button

View File

@ -1,6 +1,6 @@
<?php Block::put('breadcrumb') ?>
<ul>
<li><a href="<?= Backend::url('backend/users') ?>">System Administrators</a></li>
<li><a href="<?= Backend::url('backend/users') ?>"><?= e(trans('backend::lang.user.menu_label')) ?></a></li>
<li><?= e($this->pageTitle) ?></li>
</ul>
<?php Block::endPut() ?>
@ -19,9 +19,9 @@
data-request="onSave"
data-hotkey="ctrl+s"
data-hotkey-mac="cmd+s"
data-load-indicator="Creating Admin..."
data-load-indicator="<?= e(trans('backend::lang.user.creating')) ?>"
class="btn btn-primary">
Create
<?= e(trans('backend::lang.form.create')) ?>
</button>
<button
type="button"
@ -29,12 +29,12 @@
data-request-data="close:1"
data-hotkey="ctrl+enter"
data-hotkey-mac="cmd+enter"
data-load-indicator="Creating Admin..."
data-load-indicator="<?= e(trans('backend::lang.user.creating')) ?>"
class="btn btn-default">
Create and Close
<?= e(trans('backend::lang.form.create_and_close')) ?>
</button>
<span class="btn-text">
or <a href="<?= Backend::url('backend/users') ?>">Cancel</a>
<?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('backend/users') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
</span>
</div>
</div>
@ -57,6 +57,6 @@
<?= Block::placeholder('breadcrumb') ?>
</div>
<p class="flash-message static error"><?= e($this->fatalError) ?></p>
<p><a href="<?= Backend::url('backend/users') ?>" class="btn btn-default">Return to the administrator list</a></p>
<p><a href="<?= Backend::url('backend/users') ?>" class="btn btn-default"><?= e(trans('backend::lang.user.return')) ?></a></p>
</div>
<?php endif ?>

View File

@ -1,6 +1,6 @@
<?php Block::put('breadcrumb') ?>
<ul>
<li><a href="<?= Backend::url('backend/users') ?>">System Administrators</a></li>
<li><a href="<?= Backend::url('backend/users') ?>"><?= e(trans('backend::lang.user.menu_label')) ?></a></li>
<li><?= e($this->pageTitle) ?></li>
</ul>
<?php Block::endPut() ?>
@ -20,9 +20,9 @@
data-request-data="redirect:0"
data-hotkey="ctrl+s"
data-hotkey-mac="cmd+s"
data-load-indicator="Saving Admin..."
data-load-indicator="<?= e(trans('backend::lang.user.saving')) ?>"
class="btn btn-primary">
<u>S</u>ave
<?= e(trans('backend::lang.form.save')) ?>
</button>
<button
type="button"
@ -30,9 +30,9 @@
data-request-data="close:1"
data-hotkey="ctrl+enter"
data-hotkey-mac="cmd+enter"
data-load-indicator="Saving Admin..."
data-load-indicator="<?= e(trans('backend::lang.user.saving')) ?>"
class="btn btn-default">
Save and Close
<?= e(trans('backend::lang.form.save_and_close')) ?>
</button>
</div>
</div>
@ -54,6 +54,6 @@
<?= Block::placeholder('breadcrumb') ?>
</div>
<p class="flash-message static error"><?= e($this->fatalError) ?></p>
<p><a href="<?= Backend::url('backend/users') ?>" class="btn btn-default">Return to the administrator list</a></p>
<p><a href="<?= Backend::url('backend/users') ?>" class="btn btn-default"><?= e(trans('backend::lang.user.return')) ?></a></p>
</div>
<?php endif ?>

View File

@ -1,6 +1,6 @@
<?php Block::put('breadcrumb') ?>
<ul>
<li><a href="<?= Backend::url('backend/users') ?>">System Administrators</a></li>
<li><a href="<?= Backend::url('backend/users') ?>"><?= e(trans('backend::lang.user.menu_label')) ?></a></li>
<li><?= e($this->pageTitle) ?></li>
</ul>
<?php Block::endPut() ?>
@ -20,9 +20,9 @@
data-request-data="redirect:0"
data-hotkey="ctrl+s"
data-hotkey-mac="cmd+s"
data-load-indicator="Saving Admin..."
data-load-indicator="<?= e(trans('backend::lang.user.saving')) ?>"
class="btn btn-primary">
<u>S</u>ave
<?= e(trans('backend::lang.form.save')) ?>
</button>
<button
type="button"
@ -30,19 +30,19 @@
data-request-data="close:1"
data-hotkey="ctrl+enter"
data-hotkey-mac="cmd+enter"
data-load-indicator="Saving Admin..."
data-load-indicator="<?= e(trans('backend::lang.user.saving')) ?>"
class="btn btn-default">
Save and Close
<?= e(trans('backend::lang.form.save_and_close')) ?>
</button>
<span class="btn-text">
or <a href="<?= Backend::url('backend/users') ?>">Cancel</a>
<?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('backend/users') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
</span>
<button
type="button"
class="oc-icon-trash-o btn-icon danger pull-right"
data-request="onDelete"
data-load-indicator="Deleting Admin..."
data-request-confirm="Do you really want to delete this admin?">
data-load-indicator="<?= e(trans('backend::lang.user.deleting')) ?>"
data-request-confirm="<?= e(trans('backend::lang.user.delete_confirm')) ?>">
</button>
</div>
</div>
@ -65,6 +65,6 @@
<?= Block::placeholder('breadcrumb') ?>
</div>
<p class="flash-message static error"><?= e($this->fatalError) ?></p>
<p><a href="<?= Backend::url('backend/users') ?>" class="btn btn-default">Return to the administrator list</a></p>
<p><a href="<?= Backend::url('backend/users') ?>" class="btn btn-default"><?= e(trans('backend::lang.user.return')) ?></a></p>
</div>
<?php endif ?>

View File

@ -45,6 +45,7 @@ return [
'name' => 'Administrator',
'menu_label' => 'Administrators',
'list_title' => 'Manage Administrators',
'new' => 'New Administrator',
'login' => "Login",
'first_name' => "First Name",
'last_name' => "Last Name",
@ -59,11 +60,21 @@ 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' => [
'name' => 'Group',
'name_field' => 'Name',
'menu_label' => 'Groups',
'list_title' => 'Manage Groups',
'new' => 'New Administrator Group',
'creating' => 'Creating Group...',
'saving' => 'Saving Group...',
'deleting' => 'Deleting Group...',
'return' => 'Return to the group list',
],
'preferences' => [
'not_authenticated' => 'There is no an authenticated user to load or save preferences for.'
@ -90,6 +101,8 @@ return [
'missing_model' => 'Form behavior used in :class does not have a model defined.',
'missing_definition' => "Form behavior does not contain a field for ':field'.",
'not_found' => 'Form record with an ID of :id could not be found.',
'create' => 'Create',
'create_and_close' => 'Create and close',
'save' => 'Save',
'save_and_close' => 'Save and close',
'saving' => 'Saving...',
@ -101,6 +114,7 @@ return [
'close' => 'Close',
'delete' => 'Delete',
'ok' => 'OK',
'or' => 'or',
'confirm_tab_close' => 'Do you really want to close the tab? Unsaved changes will be lost.',
'behavior_not_ready' => 'Form behavior has not been initialized, check that you have called initForm() in your controller.',
],

View File

@ -44,7 +44,8 @@ return [
'user' => [
'name' => 'Beheerder',
'menu_label' => 'Beheerders',
'list_title' => 'Beheerders beheren',
'list_title' => 'Beheer Beheerders',
'new' => 'Nieuwe Beheerder',
'login' => "Gebruikersnaam",
'first_name' => "Voornaam",
'last_name' => "Achternaam",
@ -59,11 +60,21 @@ 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' => [
'name' => 'Groep',
'name_field' => 'Naam',
'menu_label' => 'Groepen',
'list_title' => 'Beheer Groepen',
'new' => 'Nieuwe Beheerdersgroep',
'creating' => 'Groep aanmaken...',
'saving' => 'Groep opslaan...',
'deleting' => 'Groep verwijderen...',
'return' => 'Terug naar groepenoverzicht',
],
'preferences' => [
'not_authenticated' => 'Er is geen geauthenticeerde gebruiker om gegevens voor te laden of op te slaan.'
@ -90,6 +101,8 @@ return [
'missing_model' => 'Geen model opgegeven voor het gedrag (behavior) van het formulier gebruikt in :class.',
'missing_definition' => "Het gedrag (behavior) van het formulier bevat geen kolom voor ':field'.",
'not_found' => 'Het formulier met record ID :id is niet gevonden.',
'create' => 'Maken',
'create_and_close' => 'Maken en sluiten',
'save' => 'Opslaan',
'save_and_close' => 'Opslaan en sluiten',
'saving' => 'Opslaan...',
@ -101,6 +114,7 @@ return [
'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.',
'behavior_not_ready' => 'Gedrag (behavior) van het formulier is niet geladen. Controleer of initForm() in de controller is aangeroepen.',
],