Update MM lang refs

This commit is contained in:
Samuel Georges 2017-10-16 17:52:50 +11:00
parent 9309d826d0
commit 2a1234d21c
24 changed files with 76 additions and 76 deletions

View File

@ -100,7 +100,7 @@ class ServiceProvider extends ModuleServiceProvider
'order' => 10
],
'media' => [
'label' => 'cms::lang.media.menu_label',
'label' => 'backend::lang.media.menu_label',
'icon' => 'icon-folder',
'iconSvg' => 'modules/backend/assets/images/media-icon.svg',
'url' => Backend::url('backend/media'),
@ -152,8 +152,8 @@ class ServiceProvider extends ModuleServiceProvider
'tab' => 'system::lang.permissions.name'
],
'media.manage_media' => [
'label' => 'cms::lang.permissions.manage_media',
'tab' => 'cms::lang.permissions.name',
'label' => 'backend::lang.permissions.manage_media',
'tab' => 'system::lang.permissions.name',
]
]);
});

View File

@ -25,7 +25,7 @@ class Media extends Controller
parent::__construct();
BackendMenu::setContext('October.Backend', 'media', true);
$this->pageTitle = 'cms::lang.media.menu_label';
$this->pageTitle = 'backend::lang.media.menu_label';
$manager = new MediaManager($this, 'manager');
$manager->bindToController();

View File

@ -27,7 +27,7 @@ class MediaFinder extends FormWidgetBase
/**
* @var string Prompt to display if no record is selected.
*/
public $prompt = 'cms::lang.mediafinder.default_prompt';
public $prompt = 'backend::lang.mediafinder.default_prompt';
/**
* @var string Display mode for the selection. Values: file, image.

View File

@ -322,7 +322,7 @@ class MediaManager extends WidgetBase
* Validate extension
*/
if (!$this->validateFileType($newName)) {
throw new ApplicationException(Lang::get('cms::lang.media.type_blocked'));
throw new ApplicationException(Lang::get('backend::lang.media.type_blocked'));
}
/*
@ -369,14 +369,14 @@ class MediaManager extends WidgetBase
$library = MediaLibrary::instance();
if ($library->folderExists($newFolderPath)) {
throw new ApplicationException(Lang::get('cms::lang.media.folder_or_file_exist'));
throw new ApplicationException(Lang::get('backend::lang.media.folder_or_file_exist'));
}
/*
* Create the new folder
*/
if (!$library->makeFolder($newFolderPath)) {
throw new ApplicationException(Lang::get('cms::lang.media.error_creating_folder'));
throw new ApplicationException(Lang::get('backend::lang.media.error_creating_folder'));
}
/*
@ -407,7 +407,7 @@ class MediaManager extends WidgetBase
$path = $folder;
if ($folder == '/') {
$name = Lang::get('cms::lang.media.library');
$name = Lang::get('backend::lang.media.library');
}
else {
$segments = explode('/', $folder);
@ -427,12 +427,12 @@ class MediaManager extends WidgetBase
{
$dest = trim(Input::get('dest'));
if (!strlen($dest)) {
throw new ApplicationException(Lang::get('cms::lang.media.please_select_move_dest'));
throw new ApplicationException(Lang::get('backend::lang.media.please_select_move_dest'));
}
$dest = MediaLibrary::validatePath($dest);
if ($dest == Input::get('originalPath')) {
throw new ApplicationException(Lang::get('cms::lang.media.move_dest_src_match'));
throw new ApplicationException(Lang::get('backend::lang.media.move_dest_src_match'));
}
$files = Input::get('files', []);
@ -1115,7 +1115,7 @@ class MediaManager extends WidgetBase
* Check for unsafe file extensions
*/
if (!$this->validateFileType($fileName)) {
throw new ApplicationException(Lang::get('cms::lang.media.type_blocked'));
throw new ApplicationException(Lang::get('backend::lang.media.type_blocked'));
}
/*

View File

@ -3,11 +3,11 @@
class="layout"
data-alias="<?= $this->alias ?>"
data-unique-id="<?= $this->getId() ?>"
data-delete-empty="<?= e(trans('cms::lang.media.delete_empty')) ?>"
data-delete-confirm="<?= e(trans('cms::lang.media.delete_confirm')) ?>"
data-move-empty="<?= e(trans('cms::lang.media.move_empty')) ?>"
data-select-single-image="<?= e(trans('cms::lang.media.select_single_image')) ?>"
data-selection-not-image="<?= e(trans('cms::lang.media.selection_not_image')) ?>"
data-delete-empty="<?= e(trans('backend::lang.media.delete_empty')) ?>"
data-delete-confirm="<?= e(trans('backend::lang.media.delete_confirm')) ?>"
data-move-empty="<?= e(trans('backend::lang.media.move_empty')) ?>"
data-select-single-image="<?= e(trans('backend::lang.media.select_single_image')) ?>"
data-selection-not-image="<?= e(trans('backend::lang.media.selection_not_image')) ?>"
data-bottom-toolbar="<?= $this->bottomToolbar ? 'true' : 'false' ?>"
data-crop-and-insert-button="<?= $this->cropAndInsertButton ? 'true' : 'false' ?>"
tabindex="0"

View File

@ -6,7 +6,7 @@
data-command="popup-command"
data-popup-command="insert"
class="btn btn-primary">
<?= e(trans('cms::lang.media.insert')) ?>
<?= e(trans('backend::lang.media.insert')) ?>
</button>
<button
@ -14,7 +14,7 @@
data-command="popup-command"
data-popup-command="crop-and-insert"
class="btn btn-primary hide">
<?= e(trans('cms::lang.media.crop_and_insert')) ?>
<?= e(trans('backend::lang.media.crop_and_insert')) ?>
</button>
<button

View File

@ -1,9 +1,9 @@
<?php
$selectionModes = [
Backend\Widgets\MediaManager::SELECTION_MODE_NORMAL => trans('cms::lang.media.selection_mode_normal'),
Backend\Widgets\MediaManager::SELECTION_MODE_FIXED_RATIO => trans('cms::lang.media.selection_mode_fixed_ratio'),
Backend\Widgets\MediaManager::SELECTION_MODE_FIXED_SIZE => trans('cms::lang.media.selection_mode_fixed_size')
Backend\Widgets\MediaManager::SELECTION_MODE_NORMAL => trans('backend::lang.media.selection_mode_normal'),
Backend\Widgets\MediaManager::SELECTION_MODE_FIXED_RATIO => trans('backend::lang.media.selection_mode_fixed_ratio'),
Backend\Widgets\MediaManager::SELECTION_MODE_FIXED_SIZE => trans('backend::lang.media.selection_mode_fixed_size')
];
$sizeDisabledAttr = $currentSelectionMode == Backend\Widgets\MediaManager::SELECTION_MODE_NORMAL ? 'disabled="disabled"' : null;
@ -12,29 +12,29 @@
<div class="control-toolbar toolbar-padded">
<div class="toolbar-item toolbar-primary">
<div data-control="toolbar">
<label class="standalone"><?= e(trans('cms::lang.media.image_size')) ?> <span data-label="width"><?= $dimensions[0] ?></span> x <span data-label="height"><?= $dimensions[1] ?></span></label>
<label class="standalone"><?= e(trans('backend::lang.media.image_size')) ?> <span data-label="width"><?= $dimensions[0] ?></span> x <span data-label="height"><?= $dimensions[1] ?></span></label>
<div class="btn-group offset-right">
<button type="button" class="btn btn-primary standalone" data-command="resize"
><?= e(trans('cms::lang.media.resize')) ?></button>
><?= e(trans('backend::lang.media.resize')) ?></button>
<button type="button" class="btn btn-primary oc-icon-undo empty" data-command="undo-resizing"></button>
</div>
<label for="mmcropimagewidth"><?= e(trans('cms::lang.media.selection_mode')) ?></label>
<label for="mmcropimagewidth"><?= e(trans('backend::lang.media.selection_mode')) ?></label>
<select name="selectionMode" class="form-control custom-select w-150" data-control="selection-mode">
<?php foreach ($selectionModes as $mode=>$name): ?>
<option <?= $mode == $currentSelectionMode ? 'selected="selected"' : null ?> value="<?= $mode ?>"><?= e($name) ?></option>
<?php endforeach ?>
</select>
<label for="mmcropimagewidth"><?= e(trans('cms::lang.media.width')) ?></label>
<label for="mmcropimagewidth"><?= e(trans('backend::lang.media.width')) ?></label>
<input id="mmcropimagewidth" type="text" class="form-control w-50" data-control="crop-width-input" name="selectionWidth" value="<?= e($currentSelectionWidth) ?>" <?= $sizeDisabledAttr ?>/>
<label for="mmcropimageheight"><?= e(trans('cms::lang.media.height')) ?></label>
<label for="mmcropimageheight"><?= e(trans('backend::lang.media.height')) ?></label>
<input id="mmcropimageheight" type="text" class="form-control w-50" data-control="crop-height-input" name="selectionHeight" value="<?= e($currentSelectionHeight) ?>" <?= $sizeDisabledAttr ?>/>
<label class="standalone hide" data-label="selection-size"><?= e(trans('cms::lang.media.selected_size')) ?> <span data-label="selection-width"></span> x <span data-label="selection-height"></span></label>
<label class="standalone hide" data-label="selection-size"><?= e(trans('backend::lang.media.selected_size')) ?> <span data-label="selection-width"></span> x <span data-label="selection-height"></span></label>
</div>
</div>

View File

@ -1,39 +1,39 @@
<h3 class="section"><?= e(trans('cms::lang.media.display')) ?></h3>
<h3 class="section"><?= e(trans('backend::lang.media.display')) ?></h3>
<ul class="nav nav-stacked selector-group">
<li role="presentation" <?php if ($currentFilter == Backend\Widgets\MediaManager::FILTER_EVERYTHING): ?>class="active"<?php endif ?>>
<a href="#" data-command="set-filter" data-filter="<?= Backend\Widgets\MediaManager::FILTER_EVERYTHING ?>">
<i class="icon-recycle"></i>
<?= e(trans('cms::lang.media.filter_everything')) ?>
<?= e(trans('backend::lang.media.filter_everything')) ?>
</a>
</li>
<li role="presentation" <?php if ($currentFilter == System\Classes\MediaLibraryItem::FILE_TYPE_IMAGE): ?>class="active"<?php endif ?>>
<a href="#" data-command="set-filter" data-filter="<?= System\Classes\MediaLibraryItem::FILE_TYPE_IMAGE ?>">
<i class="icon-picture-o"></i>
<?= e(trans('cms::lang.media.filter_images')) ?>
<?= e(trans('backend::lang.media.filter_images')) ?>
</a>
</li>
<li role="presentation" <?php if ($currentFilter == System\Classes\MediaLibraryItem::FILE_TYPE_VIDEO): ?>class="active"<?php endif ?>>
<a href="#" data-command="set-filter" data-filter="<?= System\Classes\MediaLibraryItem::FILE_TYPE_VIDEO ?>">
<i class="icon-video-camera"></i>
<?= e(trans('cms::lang.media.filter_video')) ?>
<?= e(trans('backend::lang.media.filter_video')) ?>
</a>
</li>
<li role="presentation" <?php if ($currentFilter == System\Classes\MediaLibraryItem::FILE_TYPE_AUDIO): ?>class="active"<?php endif ?>>
<a href="#" data-command="set-filter" data-filter="<?= System\Classes\MediaLibraryItem::FILE_TYPE_AUDIO ?>">
<i class="icon-volume-up"></i>
<?= e(trans('cms::lang.media.filter_audio')) ?>
<?= e(trans('backend::lang.media.filter_audio')) ?>
</a>
</li>
<li role="presentation" <?php if ($currentFilter == System\Classes\MediaLibraryItem::FILE_TYPE_DOCUMENT): ?>class="active"<?php endif ?>>
<a href="#" data-command="set-filter" data-filter="<?= System\Classes\MediaLibraryItem::FILE_TYPE_DOCUMENT ?>">
<i class="icon-file"></i>
<?= e(trans('cms::lang.media.filter_documents')) ?>
<?= e(trans('backend::lang.media.filter_documents')) ?>
</a>
</li>
</ul>

View File

@ -1,5 +1,5 @@
<ul class="tree-path">
<li class="root"><a href="javascript:;" data-type="media-item" data-item-type="folder" data-path="/" data-clear-search="true"><?= e(trans('cms::lang.media.library')) ?></a></li>
<li class="root"><a href="javascript:;" data-type="media-item" data-item-type="folder" data-path="/" data-clear-search="true"><?= e(trans('backend::lang.media.library')) ?></a></li>
<?php if (!$searchMode): ?>
<?php foreach ($pathSegments as $folder => $path): ?>
@ -8,6 +8,6 @@
<?php endif ?>
<?php endforeach?>
<?php else: ?>
<li><a href="javascript:;" data-type="media-item"><?= e(trans('cms::lang.media.search')) ?></a></li>
<li><a href="javascript:;" data-type="media-item"><?= e(trans('backend::lang.media.search')) ?></a></li>
<?php endif ?>
</ul>

View File

@ -10,7 +10,7 @@
<div class="icon-wrapper"><i class="icon-folder"></i></div>
</div>
<div class="info">
<h4 title="<?= e(trans('cms::lang.media.return_to_parent')) ?>"><?= e(trans('cms::lang.media.return_to_parent_label')) ?></h4>
<h4 title="<?= e(trans('backend::lang.media.return_to_parent')) ?>"><?= e(trans('backend::lang.media.return_to_parent_label')) ?></h4>
</div>
</li>
<?php endif ?>
@ -54,7 +54,7 @@
<?php if (count($items) == 0 && $searchMode): ?>
<li class="no-data">
<?= e(trans('cms::lang.media.no_files_found')) ?>
<?= e(trans('backend::lang.media.no_files_found')) ?>
</li>
<?php endif ?>
</ul>

View File

@ -13,7 +13,7 @@
type="button"
data-command="insert"
class="btn btn-primary">
<?= e(trans('cms::lang.media.crop_and_insert')) ?>
<?= e(trans('backend::lang.media.crop_and_insert')) ?>
</button>
<button

View File

@ -3,7 +3,7 @@
<input type="hidden" data-type="search-mode" value="<?= $searchMode ? 'true' : 'false' ?>"/>
<div class="list-container">
<?php if (count($items) == 0 && $isRootFolder && !$searchMode): ?>
<div class="empty-library"><?= e(trans('cms::lang.media.empty_library')) ?></div>
<div class="empty-library"><?= e(trans('backend::lang.media.empty_library')) ?></div>
<?php endif ?>
<?php if ($viewMode == Backend\Widgets\MediaManager::VIEW_MODE_GRID): ?>

View File

@ -22,7 +22,7 @@
<div class="sidebar-image-placeholder-container">
<div class="sidebar-image-placeholder no-border">
<i class="icon-crop"></i>
<p><?= e(trans('cms::lang.media.nothing_selected')) ?></p>
<p><?= e(trans('backend::lang.media.nothing_selected')) ?></p>
</div>
</div>
</script>
@ -31,7 +31,7 @@
<div class="sidebar-image-placeholder-container">
<div class="sidebar-image-placeholder no-border">
<i class="icon-asterisk"></i>
<p><?= e(trans('cms::lang.media.multiple_selected')) ?></p>
<p><?= e(trans('backend::lang.media.multiple_selected')) ?></p>
</div>
</div>
</script>
@ -40,7 +40,7 @@
<div class="sidebar-image-placeholder-container">
<div class="sidebar-image-placeholder no-border">
<i class="icon-level-up"></i>
<p><?= e(trans('cms::lang.media.return_to_parent')) ?></p>
<p><?= e(trans('backend::lang.media.return_to_parent')) ?></p>
</div>
</div>
</script>

View File

@ -61,6 +61,6 @@
<?php if (count($items) == 0 && $searchMode): ?>
<p class="no-data">
<?= e(trans('cms::lang.media.no_files_found')) ?>
<?= e(trans('backend::lang.media.no_files_found')) ?>
</p>
<?php endif ?>

View File

@ -1,11 +1,11 @@
<?= Form::open() ?>
<div class="modal-header">
<button type="button" class="close" data-dismiss="popup">&times;</button>
<h4 class="modal-title"><?= e(trans('cms::lang.media.move_popup_title')) ?></h4>
<h4 class="modal-title"><?= e(trans('backend::lang.media.move_popup_title')) ?></h4>
</div>
<div class="modal-body">
<div class="form-group">
<label><?= e(trans('cms::lang.media.move_destination')) ?></label>
<label><?= e(trans('backend::lang.media.move_destination')) ?></label>
<select
class="form-control custom-select"
name="dest"

View File

@ -2,11 +2,11 @@
<?= Form::open() ?>
<div class="modal-header">
<button type="button" class="close" data-dismiss="popup">&times;</button>
<h4 class="modal-title"><?= e(trans('cms::lang.media.new_folder_title')) ?></h4>
<h4 class="modal-title"><?= e(trans('backend::lang.media.new_folder_title')) ?></h4>
</div>
<div class="modal-body">
<div class="form-group">
<label><?= e(trans('cms::lang.media.folder_name')) ?></label>
<label><?= e(trans('backend::lang.media.folder_name')) ?></label>
<input
type="text"
class="form-control"

View File

@ -2,15 +2,15 @@
<?= Form::open() ?>
<div class="modal-header">
<button type="button" class="close" data-dismiss="popup">&times;</button>
<h4 class="modal-title"><?= e(trans('cms::lang.media.resize_image')) ?></h4>
<h4 class="modal-title"><?= e(trans('backend::lang.media.resize_image')) ?></h4>
</div>
<div class="modal-body">
<div class="form-group span-left">
<label><?= e(trans('cms::lang.media.width')) ?></label>
<label><?= e(trans('backend::lang.media.width')) ?></label>
<input type="text" class="form-control" name="width" value="" />
</div>
<div class="form-group span-right">
<label><?= e(trans('cms::lang.media.height')) ?></label>
<label><?= e(trans('backend::lang.media.height')) ?></label>
<input type="text" class="form-control" name="height" value="" />
</div>
</div>

View File

@ -1,25 +1,25 @@
<?= $this->makePartial('item-sidebar-preview') ?>
<div class="panel hide" data-control="sidebar-labels">
<label><?= e(trans('cms::lang.media.title')) ?></label>
<label><?= e(trans('backend::lang.media.title')) ?></label>
<p data-label="title"></p>
<table class="name-value-list">
<tr>
<th><?= e(trans('cms::lang.media.size')) ?></th>
<th><?= e(trans('backend::lang.media.size')) ?></th>
<td data-label="size"></td>
</tr>
<tr>
<th><?= e(trans('cms::lang.media.public_url')) ?></th>
<td><a href="#" data-label="public-url" target="_blank"><?= e(trans('cms::lang.media.click_here')) ?></a></td>
<th><?= e(trans('backend::lang.media.public_url')) ?></th>
<td><a href="#" data-label="public-url" target="_blank"><?= e(trans('backend::lang.media.click_here')) ?></a></td>
</tr>
<tr data-control="last-modified">
<th><?= e(trans('cms::lang.media.last_modified')) ?></th>
<th><?= e(trans('backend::lang.media.last_modified')) ?></th>
<td data-label="last-modified"></td>
</tr>
<tr data-control="item-folder" class="hide">
<th><?= e(trans('cms::lang.media.folder')) ?></th>
<th><?= e(trans('backend::lang.media.folder')) ?></th>
<td><a href="#" data-type="media-item" data-item-type="folder" data-label="folder" data-clear-search="true"></a></td>
</tr>
</table>

View File

@ -1,18 +1,18 @@
<?php
$sortModes = [
Cms\Classes\MediaLibrary::SORT_BY_TITLE => trans('cms::lang.media.title'),
Cms\Classes\MediaLibrary::SORT_BY_SIZE => trans('cms::lang.media.size'),
Cms\Classes\MediaLibrary::SORT_BY_MODIFIED => trans('cms::lang.media.last_modified')
Cms\Classes\MediaLibrary::SORT_BY_TITLE => trans('backend::lang.media.title'),
Cms\Classes\MediaLibrary::SORT_BY_SIZE => trans('backend::lang.media.size'),
Cms\Classes\MediaLibrary::SORT_BY_MODIFIED => trans('backend::lang.media.last_modified')
];
$sortDirections = [
Cms\Classes\MediaLibrary::SORT_DIRECTION_ASC => trans('cms::lang.media.direction_asc'),
Cms\Classes\MediaLibrary::SORT_DIRECTION_DESC => trans('cms::lang.media.direction_desc')
Cms\Classes\MediaLibrary::SORT_DIRECTION_ASC => trans('backend::lang.media.direction_asc'),
Cms\Classes\MediaLibrary::SORT_DIRECTION_DESC => trans('backend::lang.media.direction_desc')
];
?>
<div class="sidebar-group">
<h3 class="section"><?= e(trans('cms::lang.media.order_by')) ?></h3>
<h3 class="section"><?= e(trans('backend::lang.media.order_by')) ?></h3>
<select
name="sorting"
@ -29,7 +29,7 @@
</div>
<div class="sidebar-group">
<h3 class="section"><?= e(trans('cms::lang.media.direction')) ?></h3>
<h3 class="section"><?= e(trans('backend::lang.media.direction')) ?></h3>
<select
name="sorting"

View File

@ -1,6 +1,6 @@
<?php if (!$isError): ?>
<img src="<?= $imageUrl ?>"/>
<?php else: ?>
<i class="icon-chain-broken" title="<?= e(trans('cms::lang.media.thumbnail_error')) ?>"></i>
<p class="thumbnail-error-message"><?= e(trans('cms::lang.media.thumbnail_error')) ?></p>
<i class="icon-chain-broken" title="<?= e(trans('backend::lang.media.thumbnail_error')) ?>"></i>
<p class="thumbnail-error-message"><?= e(trans('backend::lang.media.thumbnail_error')) ?></p>
<?php endif ?>

View File

@ -4,17 +4,17 @@
<div data-control="toolbar">
<div class="btn-group offset-right">
<button type="button" class="btn btn-primary oc-icon-upload" data-control="upload"
><?= e(trans('cms::lang.media.upload')) ?></button>
<button type="button" class="btn btn-primary oc-icon-folder" data-command="create-folder"><?= e(trans('cms::lang.media.add_folder')) ?></button>
><?= e(trans('backend::lang.media.upload')) ?></button>
<button type="button" class="btn btn-primary oc-icon-folder" data-command="create-folder"><?= e(trans('backend::lang.media.add_folder')) ?></button>
</div>
<button type="button" class="btn btn-default oc-icon-refresh empty offset-right" data-command="refresh"></button>
<div class="btn-group offset-right">
<button type="button" class="btn btn-default oc-icon-reply-all" data-command="move"
><?= e(trans('cms::lang.media.move')) ?></button>
><?= e(trans('backend::lang.media.move')) ?></button>
<button type="button" class="btn btn-default oc-icon-trash" data-command="delete"
><?= e(trans('cms::lang.media.delete')) ?></button>
><?= e(trans('backend::lang.media.delete')) ?></button>
</div>
<div class="btn-group offset-right" id="<?= $this->getId('view-mode-buttons') ?>">
@ -29,7 +29,7 @@
name="search"
value="<?= e($searchTerm) ?>"
class="form-control icon search growable"
placeholder="<?= e(trans('cms::lang.media.search')) ?>"
placeholder="<?= e(trans('backend::lang.media.search')) ?>"
data-control="search"
autocomplete="off"
data-load-indicator

View File

@ -3,9 +3,9 @@
<div class="upload-progress">
<h5
data-label="file-number-and-progress"
data-message-template="<?= e(trans('cms::lang.media.uploading_file_num')) ?> &lt;span&gt;:percents&lt;/span&gt;"
data-success-template="<?= e(trans('cms::lang.media.uploading_complete')) ?>"
data-error-template="<?= e(trans('cms::lang.media.uploading_error')) ?>"
data-message-template="<?= e(trans('backend::lang.media.uploading_file_num')) ?> &lt;span&gt;:percents&lt;/span&gt;"
data-success-template="<?= e(trans('backend::lang.media.uploading_complete')) ?>"
data-error-template="<?= e(trans('backend::lang.media.uploading_error')) ?>"
></h5>
<div class="progress-controls">

View File

@ -466,7 +466,7 @@ class MediaLibrary
*/
$regex = '#'.implode('|', $regex).'#';
if (preg_match($regex, $path) !== 0 || strpos($path, '//') !== false) {
throw new ApplicationException(Lang::get('cms::lang.media.invalid_path', compact('path')));
throw new ApplicationException(Lang::get('system::lang.media.invalid_path', compact('path')));
}
return $path;

View File

@ -137,7 +137,7 @@ class MediaLibraryItem
{
return $this->type == self::TYPE_FILE
? File::sizeToString($this->size)
: $this->size.' '.trans('cms::lang.media.folder_size_items');
: $this->size.' '.trans('system::lang.media.folder_size_items');
}
/**