Merge pull request #541 from paulwilde/develop

More translation strings.
This commit is contained in:
Samuel Georges 2014-08-13 07:50:43 +10:00
commit 6cb95dd041
20 changed files with 68 additions and 44 deletions

View File

@ -5,7 +5,7 @@
})"
disabled="disabled"
data-request="onRelationManageDelete"
data-request-confirm="Are you sure?"
data-request-confirm="<?= e(trans('backend::lang.relation.delete_confirm')) ?>"
data-trigger-type="enable"
data-trigger="#<?= $this->relationGetId('view') ?> .control-list input[type=checkbox]"
data-trigger-condition="checked"

View File

@ -26,7 +26,7 @@
type="button"
class="btn btn-default"
data-dismiss="popup">
Cancel
<?= e(trans('backend::lang.relation.cancel')) ?>
</button>
</div>
<?= Form::close() ?>
@ -59,7 +59,7 @@
type="button"
class="btn btn-default"
data-dismiss="popup">
Cancel
<?= trans('backend::lang.relation.cancel') ?>
</button>
</div>
<?= Form::close() ?>

View File

@ -2,7 +2,7 @@
<div data-request-data="_relation_field: '<?= $relationField ?>'">
<div class="modal-header">
<button type="button" class="close" data-dismiss="popup">&times;</button>
<h4 class="modal-title">Add a new <?= $relationLabel ?></h4>
<h4 class="modal-title"><?= e(trans('backend::lang.relation.add_a_new', ['name'=>$relationLabel])) ?></h4>
</div>
<?= $relationManageWidget->render() ?>
@ -14,13 +14,13 @@
data-request="onRelationManageAdd"
data-dismiss="popup"
data-stripe-load-indicator>
Add selected
<?= e(trans('backend::lang.relation.add_selected')) ?>
</button>
<button
type="button"
class="btn btn-default"
data-dismiss="popup">
Cancel
<?= e(trans('backend::lang.relation.cancel')) ?>
</button>
</div>
</div>

View File

@ -2,10 +2,10 @@
<?= Form::open() ?>
<div class="modal-header">
<button type="button" class="close" data-dismiss="popup">&times;</button>
<h4 class="modal-title">Add a new <?= $relationLabel ?></h4>
<h4 class="modal-title"><?= e(trans('backend::lang.relation.add_a_new', ['name'=>$relationLabel])) ?></h4>
</div>
<div class="modal-body">
<p>Click on an item to add</p>
<p><?= e(trans('backend::lang.relation.help')) ?></p>
</div>
<?= $relationManageWidget->render() ?>
@ -15,7 +15,7 @@
type="button"
class="btn btn-default"
data-dismiss="popup">
Cancel
<?= e(trans('backend::lang.relation.cancel')) ?>
</button>
</div>
<?= Form::close() ?>

View File

@ -7,7 +7,7 @@
<div class="modal-header">
<button type="button" class="close" data-dismiss="popup">&times;</button>
<h4 class="modal-title">Related <?= $relationLabel ?> data</h4>
<h4 class="modal-title"><?= e(trans('backend::lang.relation.related_data', ['name'=>$relatedLabel])) ?></h4>
</div>
<div class="modal-body">
<?= $relationPivotWidget->render() ?>
@ -17,13 +17,13 @@
type="submit"
class="btn btn-primary"
data-dismiss="popup">
Update
<?= e(trans('backend::lang.relation.update')) ?>
</button>
<button
type="button"
class="btn btn-default"
data-dismiss="popup">
Cancel
<?= e(trans('backend::lang.relation.cancel')) ?>
</button>
</div>
@ -38,7 +38,7 @@
<div class="modal-header">
<button type="button" class="close" data-dismiss="popup">&times;</button>
<h4 class="modal-title">Related <?= $relationLabel ?> data</h4>
<h4 class="modal-title"><?= e(trans('backend::lang.relation.related_data', ['name'=>$relatedLabel])) ?></h4>
</div>
<div class="modal-body">
<?= $relationPivotWidget->render() ?>
@ -48,13 +48,13 @@
type="submit"
class="btn btn-primary"
data-dismiss="popup">
Add
<?= e(trans('backend::lang.relation.add')) ?>
</button>
<button
type="button"
class="btn btn-default"
data-dismiss="popup">
Cancel
<?= e(trans('backend::lang.relation.cancel')) ?>
</button>
</div>

View File

@ -98,9 +98,9 @@ class Users extends Controller
'comment' => $permission->comment,
'type' => 'balloon-selector',
'options' => [
1 => 'Allow',
0 => 'Inherit',
-1 => 'Deny',
1 => 'backend::lang.user.allow',
0 => 'backend::lang.user.inherit',
-1 => 'backend::lang.user.deny',
],
'attributes' => [
'data-trigger' => "input[name='User[permissions][superuser]']",

View File

@ -3,15 +3,13 @@
<div class="modal-header">
<button type="button" class="close" data-dismiss="popup">&times;</button>
<h4 class="modal-title">Attachment: <?= $file->file_name ?></h4>
<h4 class="modal-title"><?= e(trans('backend::lang.fileupload.attachment')) ?>: <?= $file->file_name ?></h4>
</div>
<div class="modal-body">
<p>
Add a title and description for this attachment.
</p>
<p><?= e(trans('backend::lang.fileupload.help')) ?></p>
<div class="form-group">
<label>Title</label>
<label><?= e(trans('backend::lang.fileupload.title_label')) ?></label>
<input
type="text"
name="title"
@ -20,7 +18,7 @@
/>
</div>
<div class="form-group">
<label>Description</label>
<label><?= e(trans('backend::lang.fileupload.description_label')) ?></label>
<textarea name="description" class="form-control"><?= $file->description ?></textarea>
</div>
@ -31,13 +29,13 @@
class="btn btn-primary"
data-request="<?= $this->getEventHandler('onSaveAttachmentConfig') ?>"
data-stripe-load-indicator>
Save
<?= e(trans('backend::lang.form.save')) ?>
</button>
<button
type="button"
class="btn btn-default"
data-dismiss="popup">
Cancel
<?= e(trans('backend::lang.form.cancel')) ?>
</button>
</div>
<?= Form::close() ?>

View File

@ -86,6 +86,9 @@ return [
'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',
'allow' => 'Allow',
'inherit' => 'Inherit',
'deny' => 'Deny',
'group' => [
'name' => 'Group',
'name_field' => 'Name',
@ -110,6 +113,9 @@ return [
'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',
'prev_page' => 'Previous page',
'next_page' => 'Next page',
'loading' => 'Loading...',
'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',
@ -117,6 +123,12 @@ return [
'apply_changes' => 'Apply changes',
'cancel' => 'Cancel'
],
'fileupload' => [
'attachment' => 'Attachment',
'help' => 'Add a title and description for this attachment.',
'title_label' => 'Title',
'description_label' => 'Description'
],
'form' => [
'create_title' => "New :name",
'update_title' => "Edit :name",
@ -151,13 +163,20 @@ return [
'select' => 'Select',
'select_all' => 'all',
'select_none' => 'none',
'insert_row' => 'Insert Row',
'delete_row' => 'Delete Row'
],
'relation' => [
'missing_definition' => "Relation behavior does not contain a definition for ':field'.",
'missing_model' => "Relation behavior used in :class does not have a model defined.",
'invalid_action_single' => "This action cannot be performed on a singular relationship.",
'invalid_action_multi' => "This action cannot be performed on a multiple relationship.",
'help' => "Click on an item to add",
'related_data' => "Related :name data",
'add' => "Add",
'add_selected' => "Add selected",
'add_a_new' => "Add a new :name",
'cancel' => "Cancel",
'add_name' => "Add :name",
'create' => "Create",
'create_name' => "Create :name",
@ -167,6 +186,7 @@ return [
'remove_name' => "Remove :name",
'delete' => "Delete",
'delete_name' => "Delete :name",
'delete_confirm' => "Are you sure?",
],
'model' => [
'name' => "Model",

View File

@ -5,7 +5,7 @@
<div data-control="balloon-selector" id="<?= $field->getId() ?>" <?= HTML::attributes($field->attributes) ?>>
<ul>
<?php foreach ($fieldOptions as $value => $text): ?>
<li data-value="<?= e($value) ?>" class="<?= $value == $field->value ? 'active' : '' ?>"><?= e($text) ?></li>
<li data-value="<?= e($value) ?>" class="<?= $value == $field->value ? 'active' : '' ?>"><?= e(trans($text)) ?></li>
<?php endforeach ?>
</ul>

View File

@ -2,5 +2,5 @@
href="javascript:;"
class="btn btn-sm btn-default oc-icon-minus-square"
onclick="$(this).closest('.datagrid-widget').find('[data-control=datagrid]').dataGrid('removeRow')">
Delete Row
<?= e(trans('backend::lang.form.delete_row')) ?>
</a>

View File

@ -2,5 +2,5 @@
href="javascript:;"
class="btn btn-sm btn-default oc-icon-plus-square"
onclick="$(this).closest('.datagrid-widget').find('[data-control=datagrid]').dataGrid('insertRow')">
Insert Row
<?= e(trans('backend::lang.form.insert_row')) ?>
</a>

View File

@ -9,8 +9,8 @@
class="page-back"
data-request="<?= $this->getEventHandler('onPaginate') ?>"
data-request-data="page: <?= $pageCurrent-1 ?>"
data-load-indicator="Loading..."
title="Previous page"></a>
data-load-indicator="<?= e(trans('backend::lang.list.loading')) ?>"
title="<?= e(trans('backend::lang.list.prev_page')) ?>"></a>
<?php endif ?>
<?php if ($pageLast > $pageCurrent): ?>
<a
@ -18,8 +18,8 @@
class="page-next"
data-request-data="page: <?= $pageCurrent+1 ?>"
data-request="<?= $this->getEventHandler('onPaginate') ?>"
data-load-indicator="Loading..."
title="Next page"></a>
data-load-indicator="<?= e(trans('backend::lang.list.loading')) ?>"
title="<?= e(trans('backend::lang.list.next_page')) ?>"></a>
<?php endif ?>
</div>
</div>

View File

@ -13,7 +13,7 @@
<select class="form-control custom-select" name="className" data-placeholder="please select">
<option></option>
<?php foreach ($widgets as $className => $widgetInfo):?>
<option value="<?= e($className) ?>"><?= isset($widgetInfo['label']) ? e($widgetInfo['label']) : $className ?></option>
<option value="<?= e($className) ?>"><?= isset($widgetInfo['label']) ? e(trans($widgetInfo['label'])) : $className ?></option>
<?php endforeach ?>
</select>
</div>

View File

@ -111,9 +111,12 @@ return [
'upload_files' => 'Upload file(s)',
'create_file' => 'Create file',
'create_directory' => 'Create directory',
'directory_popup_title' => 'New directory',
'directory_name' => 'Directory name',
'rename' => 'Rename',
'delete' => 'Delete',
'move' => 'Move',
'select' => 'Select',
'new' => 'New file',
'rename_popup_title' => 'Rename',
'rename_new_name' => 'New name',

View File

@ -32,7 +32,7 @@
data-control="popup"
data-request-data="renamePath: '<?= e($item->path) ?>'"
data-handler="<?= $this->getEventHandler('onLoadRenamePopup') ?>"
>Rename</a>
><?= e(trans('cms::lang.asset.rename')) ?></a>
</div>
<input type="hidden" name="file[<?= e($item->path) ?>]" value="0"/>
@ -45,7 +45,7 @@
<?= $this->isFileSelected($item) ? 'checked' : null ?>
data-request="<?= $this->getEventHandler('onSelect') ?>"
value="1">
<label for="<?= $cbId ?>">Select</label>
<label for="<?= $cbId ?>"><?= trans('cms::lang.asset.select') ?></label>
</div>
</li>

View File

@ -6,11 +6,11 @@
]) ?>
<div class="modal-header">
<button type="button" class="close" data-dismiss="popup">&times;</button>
<h4 class="modal-title">New directory</h4>
<h4 class="modal-title"><?= trans('cms::lang.asset.directory_popup_title') ?></h4>
</div>
<div class="modal-body">
<div class="form-group">
<label>Directory name</label>
<label><?= trans('cms::lang.asset.directory_name') ?></label>
<input type="text" class="form-control" name="name" value=""/>
</div>
@ -21,13 +21,13 @@
type="submit"
class="btn btn-primary"
>
Create
<?= trans('backend::lang.form.create') ?>
</button>
<button
type="button"
class="btn btn-default"
data-dismiss="popup">
Cancel
<?= trans('backend::lang.form.cancel') ?>
</button>
</div>
<script>

View File

@ -154,7 +154,7 @@ class ServiceProvider extends ModuleServiceProvider
*/
WidgetManager::instance()->registerReportWidgets(function($manager){
$manager->registerReportWidget('System\ReportWidgets\Status', [
'label' => 'System status',
'label' => 'backend::lang.dashboard.status.widget_title_default',
'context' => 'dashboard'
]);
});

View File

@ -41,7 +41,7 @@
type="submit"
class="btn btn-primary"
data-request="onDisablePlugins"
data-request-confirm="Are you sure?"
data-request-confirm="<?= e(trans('backend::lang.form.plugins.disable_confirm')) ?>"
data-stripe-load-indicator>
<?= e(trans('backend::lang.form.apply')) ?>
</button>

View File

@ -22,7 +22,7 @@
checked: $('.control-list').listWidget('getChecked')
})"
data-request="onRefreshPlugins"
data-request-confirm="Are you sure?"
data-request-confirm="<?= e(trans('system::lang.plugins.refresh_confirm')) ?>"
data-trigger-type="enable"
data-trigger=".control-list input[type=checkbox]"
data-trigger-condition="checked"
@ -37,7 +37,7 @@
checked: $('.control-list').listWidget('getChecked')
})"
data-request="onRemovePlugins"
data-request-confirm="Are you sure?"
data-request-confirm="<?= e(trans('system::lang.plugins.remove_confirm')) ?>"
data-trigger-type="enable"
data-trigger=".control-list input[type=checkbox]"
data-trigger-condition="checked"

View File

@ -57,8 +57,11 @@ return [
'disabled_label' => 'Disabled',
'disabled_help' => 'Plugins that are disabled are ignored by the application.',
'selected_amount' => 'Plugins selected: :amount',
'remove_confirm' => 'Are you sure?',
'remove_success' => "Successfully removed those plugins from the system.",
'refresh_confirm' => 'Are you sure?',
'refresh_success' => "Successfully refreshed those plugins in the system.",
'disable_confirm' => 'Are you sure?',
'disable_success' => "Successfully disabled those plugins.",
'enable_success' => "Successfully enabled those plugins.",
'unknown_plugin' => "Plugin has been removed from the file system.",