From 8082cd950240f6268f557e4ace5505833a22d1e0 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 2 May 2015 10:18:39 +1000
Subject: [PATCH] Tidy up work from #1073

---
 .../system/controllers/updates/_install_themes.htm   | 10 +++++-----
 modules/system/controllers/updates/install.htm       |  2 +-
 modules/system/lang/en/lang.php                      | 12 ++++++++----
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/modules/system/controllers/updates/_install_themes.htm b/modules/system/controllers/updates/_install_themes.htm
index 6090b6944..916a99f9f 100644
--- a/modules/system/controllers/updates/_install_themes.htm
+++ b/modules/system/controllers/updates/_install_themes.htm
@@ -11,7 +11,7 @@
                 name="code"
                 id="themeSearchInput"
                 class="product-search-input search-input-lg typeahead"
-                placeholder="<?= e(trans('system::lang.theme.search')) ?>"
+                placeholder="<?= e(trans('system::lang.themes.search')) ?>"
                 data-search-type="themes"
                 />
             <i class="icon icon-search"></i>
@@ -30,13 +30,13 @@
                 data-view="product/theme">
 
                 <h4 class="section-header">
-                    <a href="<?= Backend::url('cms/themes') ?>"><?= e(trans('system::lang.theme.installed')) ?></a>
+                    <a href="<?= Backend::url('cms/themes') ?>"><?= e(trans('system::lang.themes.installed')) ?></a>
                     <small>(<span class="product-counter"><?= count($installedThemes) ?></span>)</small>
                 </h4>
 
                 <?php if (!count($installedThemes)): ?>
                     <div class="product-list-empty">
-                        <p><?= e(trans('system::lang.theme.no_themes')) ?></p>
+                        <p><?= e(trans('system::lang.themes.no_themes')) ?></p>
                     </div>
                 <?php else: ?>
                     <ul class="product-list theme-list">
@@ -56,7 +56,7 @@
                                     aria-hidden="true"
                                     data-request="onRemoveTheme"
                                     data-request-data="code: '<?= $theme['dirName'] ?>'"
-                                    data-request-confirm="<?= e(trans('system::lang.theme.remove_theme')) ?>"
+                                    data-request-confirm="<?= e(trans('system::lang.themes.remove_confirm')) ?>"
                                     data-stripe-load-indicator>
                                     &times;
                                 </button>
@@ -73,7 +73,7 @@
 
             <!-- Recommended extras -->
             <div class="suggested-products-container">
-                <h4 class="section-header"><?= e(trans('system::lang.theme.recommended')) ?></h4>
+                <h4 class="section-header"><?= e(trans('system::lang.themes.recommended')) ?></h4>
                 <div class="scroll-panel">
                     <div
                         id="suggestedThemes"
diff --git a/modules/system/controllers/updates/install.htm b/modules/system/controllers/updates/install.htm
index ccb49d393..c95d8d6e3 100644
--- a/modules/system/controllers/updates/install.htm
+++ b/modules/system/controllers/updates/install.htm
@@ -20,7 +20,7 @@
                 <a
                     href="#tabThemes"
                     data-tab-url="<?= Backend::url('system/updates/install/themes') ?>">
-                    <?= e(trans('system::lang.theme.title')) ?>
+                    <?= e(trans('system::lang.updates.themes')) ?>
                 </a>
             </li>
         </ul>
diff --git a/modules/system/lang/en/lang.php b/modules/system/lang/en/lang.php
index b3037548d..c62e92979 100644
--- a/modules/system/lang/en/lang.php
+++ b/modules/system/lang/en/lang.php
@@ -55,16 +55,19 @@ return [
         ]
     ],
     'theme' => [
-        'title' => 'Themes',
+        'unnamed' => 'Unnamed theme',
         'name' => [
             'label' => 'Theme Name',
             'help' => 'Name the theme by its unique code. For example, RainLab.Vanilla'
         ],
+    ],
+    'themes' => [
+        'install' => 'Install themes',
         'search' => 'search themes to install...',
         'installed' => 'Installed themes',
         'no_themes' => 'There are no themes installed from the marketplace.',
-        'remove_theme' => 'Are you sure you want to remove this?',
-        'recommended' => 'Recommended'
+        'recommended' => 'Recommended',
+        'remove_confirm' => 'Are you sure you want to remove this theme?'
     ],
     'plugin' => [
         'unnamed' => 'Unnamed plugin',
@@ -87,7 +90,7 @@ 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_confirm' => 'Are you sure you want to remove this plugin?',
         'remove_success' => 'Successfully removed those plugins from the system.',
         'refresh_confirm' => 'Are you sure?',
         'refresh_success' => 'Successfully refreshed those plugins in the system.',
@@ -198,6 +201,7 @@ return [
         'core_downloading' => 'Downloading application files',
         'core_extracting' => 'Unpacking application files',
         'plugins' => 'Plugins',
+        'themes' => 'Themes',
         'disabled' => 'Disabled',
         'plugin_downloading' => 'Downloading plugin: :name',
         'plugin_extracting' => 'Unpacking plugin: :name',