From 2a1234d21c917fda51a52712366fa97ffb6544b3 Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Mon, 16 Oct 2017 17:52:50 +1100 Subject: [PATCH] Update MM lang refs --- modules/backend/ServiceProvider.php | 6 +++--- modules/backend/controllers/Media.php | 2 +- modules/backend/formwidgets/MediaFinder.php | 2 +- modules/backend/widgets/MediaManager.php | 14 +++++++------- .../widgets/mediamanager/partials/_body.htm | 10 +++++----- .../mediamanager/partials/_bottom-toolbar.htm | 4 ++-- .../mediamanager/partials/_crop-toolbar.htm | 18 +++++++++--------- .../widgets/mediamanager/partials/_filters.htm | 12 ++++++------ .../mediamanager/partials/_folder-path.htm | 4 ++-- .../mediamanager/partials/_generic-list.htm | 4 ++-- .../partials/_image-crop-popup-body.htm | 2 +- .../mediamanager/partials/_item-list.htm | 2 +- .../partials/_item-sidebar-preview.htm | 6 +++--- .../mediamanager/partials/_list-grid.htm | 2 +- .../mediamanager/partials/_move-form.htm | 4 ++-- .../mediamanager/partials/_new-folder-form.htm | 4 ++-- .../partials/_resize-image-form.htm | 6 +++--- .../mediamanager/partials/_right-sidebar.htm | 12 ++++++------ .../widgets/mediamanager/partials/_sorting.htm | 14 +++++++------- .../mediamanager/partials/_thumbnail-image.htm | 4 ++-- .../widgets/mediamanager/partials/_toolbar.htm | 10 +++++----- .../mediamanager/partials/_upload-progress.htm | 6 +++--- modules/system/classes/MediaLibrary.php | 2 +- modules/system/classes/MediaLibraryItem.php | 2 +- 24 files changed, 76 insertions(+), 76 deletions(-) diff --git a/modules/backend/ServiceProvider.php b/modules/backend/ServiceProvider.php index d5cd84035..195ab1856 100644 --- a/modules/backend/ServiceProvider.php +++ b/modules/backend/ServiceProvider.php @@ -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', ] ]); }); diff --git a/modules/backend/controllers/Media.php b/modules/backend/controllers/Media.php index 6a14c6635..e8c8941bb 100644 --- a/modules/backend/controllers/Media.php +++ b/modules/backend/controllers/Media.php @@ -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(); diff --git a/modules/backend/formwidgets/MediaFinder.php b/modules/backend/formwidgets/MediaFinder.php index 3688f94c7..817d0af78 100644 --- a/modules/backend/formwidgets/MediaFinder.php +++ b/modules/backend/formwidgets/MediaFinder.php @@ -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. diff --git a/modules/backend/widgets/MediaManager.php b/modules/backend/widgets/MediaManager.php index f24df2131..31a4229a0 100644 --- a/modules/backend/widgets/MediaManager.php +++ b/modules/backend/widgets/MediaManager.php @@ -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')); } /* diff --git a/modules/backend/widgets/mediamanager/partials/_body.htm b/modules/backend/widgets/mediamanager/partials/_body.htm index 7e17c4ff0..7c74a0cf9 100644 --- a/modules/backend/widgets/mediamanager/partials/_body.htm +++ b/modules/backend/widgets/mediamanager/partials/_body.htm @@ -3,11 +3,11 @@ class="layout" data-alias="alias ?>" data-unique-id="getId() ?>" - data-delete-empty="" - data-delete-confirm="" - data-move-empty="" - data-select-single-image="" - data-selection-not-image="" + data-delete-empty="" + data-delete-confirm="" + data-move-empty="" + data-select-single-image="" + data-selection-not-image="" data-bottom-toolbar="bottomToolbar ? 'true' : 'false' ?>" data-crop-and-insert-button="cropAndInsertButton ? 'true' : 'false' ?>" tabindex="0" diff --git a/modules/backend/widgets/mediamanager/partials/_bottom-toolbar.htm b/modules/backend/widgets/mediamanager/partials/_bottom-toolbar.htm index 9fb73ee79..8c0ea5ad6 100644 --- a/modules/backend/widgets/mediamanager/partials/_bottom-toolbar.htm +++ b/modules/backend/widgets/mediamanager/partials/_bottom-toolbar.htm @@ -6,7 +6,7 @@ data-command="popup-command" data-popup-command="insert" class="btn btn-primary"> - + + > - + - + /> - + /> - + diff --git a/modules/backend/widgets/mediamanager/partials/_filters.htm b/modules/backend/widgets/mediamanager/partials/_filters.htm index 240548edd..ded01d797 100644 --- a/modules/backend/widgets/mediamanager/partials/_filters.htm +++ b/modules/backend/widgets/mediamanager/partials/_filters.htm @@ -1,39 +1,39 @@ -

+

\ No newline at end of file diff --git a/modules/backend/widgets/mediamanager/partials/_folder-path.htm b/modules/backend/widgets/mediamanager/partials/_folder-path.htm index ab7641534..b3ea29708 100644 --- a/modules/backend/widgets/mediamanager/partials/_folder-path.htm +++ b/modules/backend/widgets/mediamanager/partials/_folder-path.htm @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/modules/backend/widgets/mediamanager/partials/_generic-list.htm b/modules/backend/widgets/mediamanager/partials/_generic-list.htm index 9931764b1..8525fb462 100644 --- a/modules/backend/widgets/mediamanager/partials/_generic-list.htm +++ b/modules/backend/widgets/mediamanager/partials/_generic-list.htm @@ -10,7 +10,7 @@
-

+

@@ -54,7 +54,7 @@
  • - +
    • \ No newline at end of file diff --git a/modules/backend/widgets/mediamanager/partials/_image-crop-popup-body.htm b/modules/backend/widgets/mediamanager/partials/_image-crop-popup-body.htm index 17a736a90..9771480bd 100644 --- a/modules/backend/widgets/mediamanager/partials/_image-crop-popup-body.htm +++ b/modules/backend/widgets/mediamanager/partials/_image-crop-popup-body.htm @@ -13,7 +13,7 @@ type="button" data-command="insert" class="btn btn-primary"> - + -

    +

    - +
    -

    +

    - +
    - +
    diff --git a/modules/backend/widgets/mediamanager/partials/_right-sidebar.htm b/modules/backend/widgets/mediamanager/partials/_right-sidebar.htm index abefec1bf..e429f76b2 100644 --- a/modules/backend/widgets/mediamanager/partials/_right-sidebar.htm +++ b/modules/backend/widgets/mediamanager/partials/_right-sidebar.htm @@ -1,25 +1,25 @@ makePartial('item-sidebar-preview') ?>
    - +

    - + - - + + - + - +
    diff --git a/modules/backend/widgets/mediamanager/partials/_sorting.htm b/modules/backend/widgets/mediamanager/partials/_sorting.htm index dc75b2d3f..7bc4ec981 100644 --- a/modules/backend/widgets/mediamanager/partials/_sorting.htm +++ b/modules/backend/widgets/mediamanager/partials/_sorting.htm @@ -1,18 +1,18 @@ 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') ]; ?>
    -

    +

    - -

    + +

    \ No newline at end of file diff --git a/modules/backend/widgets/mediamanager/partials/_toolbar.htm b/modules/backend/widgets/mediamanager/partials/_toolbar.htm index 786215792..35fe5be8c 100644 --- a/modules/backend/widgets/mediamanager/partials/_toolbar.htm +++ b/modules/backend/widgets/mediamanager/partials/_toolbar.htm @@ -4,17 +4,17 @@
    - + > +
    + > + >
    @@ -29,7 +29,7 @@ name="search" value="" class="form-control icon search growable" - placeholder="" + placeholder="" data-control="search" autocomplete="off" data-load-indicator diff --git a/modules/backend/widgets/mediamanager/partials/_upload-progress.htm b/modules/backend/widgets/mediamanager/partials/_upload-progress.htm index c315c84c5..1922a9229 100644 --- a/modules/backend/widgets/mediamanager/partials/_upload-progress.htm +++ b/modules/backend/widgets/mediamanager/partials/_upload-progress.htm @@ -3,9 +3,9 @@
    diff --git a/modules/system/classes/MediaLibrary.php b/modules/system/classes/MediaLibrary.php index 01a3f0664..7107eb1e5 100644 --- a/modules/system/classes/MediaLibrary.php +++ b/modules/system/classes/MediaLibrary.php @@ -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; diff --git a/modules/system/classes/MediaLibraryItem.php b/modules/system/classes/MediaLibraryItem.php index 4f9f60a5d..073db4f60 100644 --- a/modules/system/classes/MediaLibraryItem.php +++ b/modules/system/classes/MediaLibraryItem.php @@ -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'); } /**