TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #111 from erJasp/master 

Moved hard-coded text to language file (backend)
This commit is contained in:
Samuel Georges 2014-05-16 11:06:57 +10:00
parent f3827e230f 8d82727310
commit f02b541d2f
34 changed files with 245 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/backend/controllers/groups/_list_toolbar.htm
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>

14
modules/backend/controllers/groups/create.htm
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.form.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.form.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 ?>

6
modules/backend/controllers/groups/index.htm
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() ?>

20
modules/backend/controllers/groups/update.htm
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.form.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.form.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-request-confirm="Do you really want to delete this admin?">
Delete
data-load-indicator="<?= e(trans('backend::lang.form.deleting')) ?>"
data-request-confirm="<?= e(trans('backend::lang.user.group.delete_confirm')) ?>">
<?= 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 ?>

4
modules/backend/controllers/users/_list_toolbar.htm
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

14
modules/backend/controllers/users/create.htm
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.form.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.form.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 ?>

12
modules/backend/controllers/users/mysettings.htm
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.form.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.form.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 ?>

18
modules/backend/controllers/users/update.htm
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.form.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.form.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.form.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 ?>

13
modules/backend/lang/en/lang.php
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,16 @@ 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',
'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',
'delete_confirm' => 'Do you really want to delete this administrator group?',
'return' => 'Return to the group list',
],
'preferences' => [
'not_authenticated' => 'There is no an authenticated user to load or save preferences for.'
@ -90,17 +96,22 @@ 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',
'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.',
'behavior_not_ready' => 'Form behavior has not been initialized, check that you have called initForm() in your controller.',
],

15
modules/backend/lang/nl/lang.php
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,16 @@ 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',
'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',
'delete_confirm' => 'Weet je zeker dat je deze beheerdersgroep wilt verwijderen?',
'return' => 'Terug naar groepenoverzicht',
],
'preferences' => [
'not_authenticated' => 'Er is geen geauthenticeerde gebruiker om gegevens voor te laden of op te slaan.'
@ -90,17 +96,22 @@ 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',
'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.',
'behavior_not_ready' => 'Gedrag (behavior) van het formulier is niet geladen. Controleer of initForm() in de controller is aangeroepen.',
],

2
modules/backend/widgets/form/partials/_field_text.htm
View File

@ -7,7 +7,7 @@
name="<?= $field->getName() ?>"
id="<?= $field->getId() ?>"
value="<?= e($field->value) ?>"
placeholder="<?= e($field->placeholder) ?>"
placeholder="<?= e(trans($field->placeholder)) ?>"
class="form-control"
autocomplete="off"
maxlength="255"

2
modules/backend/widgets/form/partials/_field_textarea.htm
View File

@ -7,6 +7,6 @@
id="<?= $field->getId() ?>"
autocomplete="off"
class="form-control field-textarea size-<?= $field->size ?>"
placeholder="<?= $field->placeholder ?>"
placeholder="<?= e(trans($field->placeholder)) ?>"
<?= HTML::attributes($field->attributes) ?>><?= e($field->value) ?></textarea>
<?php endif?>

2
modules/backend/widgets/form/partials/_form_tabs.htm
View File

@ -5,7 +5,7 @@
<div class="<?= $isStretch?'layout-row min-size':'' ?>">
<ul class="nav nav-tabs">
<?php $index = 0; foreach ($tabs as $name => $fields): ?>
<li class="<?= $index++==0?'active':''?>"><a href="#<?= $type.'tab-'.$index ?>"><?= $name ?></a></li>
<li class="<?= $index++==0?'active':''?>"><a href="#<?= $type.'tab-'.$index ?>"><?= e(trans($name)) ?></a></li>
<?php endforeach ?>
</ul>
</div>

4
modules/cms/classes/asset/fields.yaml
View File

@ -1,6 +1,6 @@
fields:
fileName:
label: File Name
label: cms::lang.editor.filename
attributes:
default-focus: 1
@ -13,7 +13,7 @@ secondaryTabs:
stretch: true
fields:
content:
tab: Content
tab: cms::lang.editor.content
type: codeeditor
stretch: true
options:

4
modules/cms/classes/content/fields.yaml
View File

@ -1,6 +1,6 @@
fields:
fileName:
label: File Name
label: cms::lang.editor.filename
attributes:
default-focus: 1
@ -13,7 +13,7 @@ secondaryTabs:
stretch: true
fields:
content:
tab: Content
tab: cms::lang.editor.content
type: codeeditor
stretch: true
options:

8
modules/cms/classes/layout/fields.yaml
View File

@ -1,12 +1,12 @@
fields:
fileName:
label: File Name
label: cms::lang.editor.filename
span: left
attributes:
default-focus: 1
settings[description]:
label: Description
label: cms::lang.editor.description
span: right
toolbar:
@ -20,14 +20,14 @@ secondaryTabs:
stretch: true
fields:
markup:
tab: Markup
tab: cms::lang.editor.markup
type: codeeditor
stretch: true
options:
language: twig
code:
tab: Code
tab: cms::lang.editor.code
type: codeeditor
stretch: true
options:

30
modules/cms/classes/page/fields.yaml
View File

@ -1,15 +1,15 @@
fields:
settings[title]:
span: left
label: Title
placeholder: New page title
label: cms::lang.editor.title
placeholder: cms::lang.editor.new_title
attributes:
default-focus: 1
settings[url]:
span: right
placeholder: /
label: URL
label: cms::lang.editor.url
attributes:
data-input-preset: 'input[name="settings[title]"]'
data-input-preset-type: url
@ -31,34 +31,34 @@ tabs:
# type: checkbox
fileName:
tab: Settings
tab: cms::lang.editor.settings
span: left
label: File Name
label: cms::lang.editor.filename
attributes:
data-input-preset: 'input[name="settings[title]"]'
data-input-preset-type: file
data-input-preset-closest-parent: form
settings[layout]:
tab: Settings
tab: cms::lang.editor.settings
span: right
label: Layout
label: cms::lang.editor.layout
type: dropdown
options: getLayoutOptions
settings[description]:
tab: Settings
label: Description
tab: cms::lang.editor.settings
label: cms::lang.editor.description
type: textarea
size: tiny
settings[meta_title]:
tab: Meta
label: Meta Title
tab: cms::lang.editor.meta
label: cms::lang.editor.meta_title
settings[meta_description]:
tab: Meta
label: Meta Description
tab: cms::lang.editor.meta
label: cms::lang.editor.meta_description
type: textarea
size: tiny
@ -66,14 +66,14 @@ secondaryTabs:
stretch: true
fields:
markup:
tab: Markup
tab: cms::lang.editor.markup
type: codeeditor
stretch: true
options:
language: twig
code:
tab: Code
tab: cms::lang.editor.code
type: codeeditor
stretch: true
options:

6
modules/cms/classes/partial/fields.yaml
View File

@ -1,13 +1,13 @@
fields:
fileName:
span: left
label: File Name
label: cms::lang.editor.filename
attributes:
default-focus: 1
settings[description]:
span: right
label: Description
label: cms::lang.editor.description
toolbar:
type: partial
@ -18,7 +18,7 @@ secondaryTabs:
stretch: true
fields:
markup:
tab: Markup
tab: cms::lang.editor.markup
type: codeeditor
stretch: true
options:

4
modules/cms/controllers/index/_page_toolbar.htm
View File

@ -6,7 +6,7 @@
data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
data-hotkey="ctrl+s"
data-hotkey-mac="cmd+s">
<?= e(trans('backend::lang.form.save')) ?>
<?= e(trans('backend::lang.form.save')) ?>
</a>
<?php
@ -17,7 +17,7 @@
target="_blank"
class="btn btn-primary oc-icon-screenshot <?php if (!$templatePath): ?>hide<?php endif ?>"
data-control="preview-button">
Preview
<?= e(trans('cms::lang.editor.preview')) ?>
</a>
<button

20
modules/cms/lang/en/lang.php
View File

@ -74,6 +74,26 @@ return [
'cms' => [
'menu_label' => "CMS"
],
'sidebar' => [
'add' => 'Add',
'search' => 'Search...'
],
'editor' => [
'settings' => 'Settings',
'title' => 'Title',
'new_title' => 'Nieuwe paginatitel',
'url' => 'URL',
'filename' => 'File Name',
'layout' => 'Layout',
'description' => 'Description',
'preview' => 'Preview',
'meta' => 'Meta',
'meta_title' => 'Meta Title',
'meta_description' => 'Meta Description',
'markup' => 'Markup',
'code' => 'Code',
'content' => 'Content',
],
'asset' => [
'menu_label' => "Assets",
'drop_down_add_title' => 'Add...',

20
modules/cms/lang/nl/lang.php
View File

@ -74,6 +74,26 @@ return [
'cms' => [
'menu_label' => "CMS"
],
'sidebar' => [
'add' => 'Toevoegen',
'search' => 'Zoeken...'
],
'editor' => [
'settings' => 'Instellingen',
'title' => 'Titel',
'new_title' => 'Nieuwe paginatitel',
'url' => 'URL',
'filename' => 'Bestandsnaam',
'layout' => 'Layout',
'description' => 'Omschrijving',
'preview' => 'Voorbeeld',
'meta' => 'Meta',
'meta_title' => 'Meta Titel',
'meta_description' => 'Meta Omschrijving',
'markup' => 'Opmaak',
'code' => 'Code',
'content' => 'Content',
],
'asset' => [
'menu_label' => "Middelen",
'drop_down_add_title' => 'Toevoegen...',

4
modules/cms/widgets/assetlist/partials/_toolbar.htm
View File

@ -7,7 +7,7 @@
<button type="button" class="btn btn-primary oc-icon-plus"
data-control="create-asset"
data-toggle="dropdown"
>Add</button>
><?= e(trans('cms::lang.sidebar.add')) ?></button>
<ul class="dropdown-menu" role="menu" data-dropdown-title="<?= e(trans('cms::lang.asset.drop_down_add_title')) ?>">
<li role="presentation"><a role="menuitem" tabindex="-1" href="javascript:;" data-control="create-template" class="oc-icon-file-text-o"><?= e(trans('cms::lang.asset.create_file')) ?></a></li>
@ -60,7 +60,7 @@
</div>
<div class="layout-cell">
<div class="relative toolbar-item loading-indicator-container size-input-text">
<input placeholder="search..." type="text" name="search" value="<?= e($this->getSearchTerm()) ?>"
<input placeholder="<?= e(trans('cms::lang.sidebar.search')) ?>" type="text" name="search" value="<?= e($this->getSearchTerm()) ?>"
class="form-control icon search" autocomplete="off"
data-track-input
data-load-indicator

2
modules/cms/widgets/componentlist/partials/_toolbar.htm
View File

@ -2,7 +2,7 @@
<div class="layout control-toolbar">
<div class="layout-cell">
<div class="relative toolbar-item loading-indicator-container size-input-text">
<input placeholder="search..." type="text" name="search" value="<?= e($this->getSearchTerm()) ?>"
<input placeholder="<?= e(trans('cms::lang.sidebar.search')) ?>" type="text" name="search" value="<?= e($this->getSearchTerm()) ?>"
class="form-control icon search" autocomplete="off"
data-track-input
data-load-indicator

4
modules/cms/widgets/templatelist/partials/_toolbar.htm
View File

@ -5,7 +5,7 @@
<div class="btn-group">
<button type="button" class="btn btn-primary oc-icon-plus last"
data-control="create-template"
>Add</button>
><?= e(trans('cms::lang.sidebar.add')) ?></button>
<button type="button" class="btn btn-primary empty oc-icon-trash-o hide"
id="<?= $this->getId('delete-button') ?>"
data-control="delete-template"
@ -18,7 +18,7 @@
</div>
<div class="layout-cell">
<div class="relative toolbar-item loading-indicator-container size-input-text">
<input placeholder="search..." type="text" name="search" value="<?= e($this->getSearchTerm()) ?>"
<input placeholder="<?= e(trans('cms::lang.sidebar.search')) ?>" type="text" name="search" value="<?= e($this->getSearchTerm()) ?>"
class="form-control icon search" autocomplete="off"
data-track-input
data-load-indicator

4
modules/system/ServiceProvider.php
View File

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

2
modules/system/controllers/Settings.php
View File

@ -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);

4
modules/system/controllers/settings/index.htm
View File

@ -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>
<p><?= $item->description ?></p>
<h5><?= e(trans($item->label)) ?></h5>
<p><?= e(trans($item->description)) ?></p>
</a>
</div>
<?php endforeach ?>

10
modules/system/controllers/settings/update.htm
View File

@ -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 ?>

2
modules/system/controllers/updates/config_list.yaml
View File

@ -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

6
modules/system/controllers/updates/index.htm
View File

@ -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 ?>

29
modules/system/lang/en/lang.php
View File

@ -25,17 +25,41 @@ 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.',
'general' => 'General',
'method' => 'Email Method',
'sender_name' => 'Sender Name',
'sender_email' => 'Sender Email',
'smtp' => 'SMTP',
'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' => 'Sendmail',
'sendmail_path' => 'Sendmail Path',
'sendmail_path_comment' => 'Please specify the path of the sendmail program.',
],
'install' => [
'project_label' => 'Attach to Project',
@ -45,10 +69,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',

31
modules/system/lang/nl/lang.php
View File

@ -25,17 +25,41 @@ 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.',
'general' => 'Algemeen',
'method' => 'Email Methode',
'sender_name' => 'Naam Afzender',
'sender_email' => 'E-mailadres Afzender',
'smtp' => 'SMTP',
'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' => 'Sendmail',
'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 +69,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',

44
modules/system/models/emailsettings/fields.yaml
View File

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

8
modules/system/models/pluginversion/columns.yaml
View File

@ -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