wip #2628 @1

diff --git a/src/CubistBackpackServiceProvider.php b/src/CubistBackpackServiceProvider.php
index 22226964a842af5fc54bb67efd437f1738345806..9006bca1486f274867d9e90cedaf168be647eaad 100644 (file)
--- a/src/CubistBackpackServiceProvider.php
+++ b/src/CubistBackpackServiceProvider.php
@@ -49,6 +49,8 @@ class CubistBackpackServiceProvider extends ServiceProvider
         // publish the migrations and seeds
         $this->publishes([__DIR__ . '/database/migrations/' => database_path('migrations')], 'migrations');
 
+        $this->loadTranslationsFrom(__DIR__ . '/resources/lang', 'cubist_back');
+
         // publish translation files
         $this->publishes([__DIR__ . '/resources/lang' => resource_path('lang/vendor/cubist_back')], 'lang');
     }
@@ -86,6 +88,6 @@ class CubistBackpackServiceProvider extends ServiceProvider
 
         // register their aliases
         $loader = \Illuminate\Foundation\AliasLoader::getInstance();
-        $loader->alias('Setting', \Backpack\Settings\app\Models\Template::class);
+        $loader->alias('Template', \Backpack\Settings\app\Models\Template::class);
     }
 }

diff --git a/src/languages/en/templates.php b/src/languages/en/templates.php
deleted file mode 100644 (file)
index f7982d3..0000000
--- a/src/languages/en/templates.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-return [
-    /*
-    |--------------------------------------------------------------------------
-    | Templates Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines are used for Cubist backpack
-    |
-    */
-    'name'             => 'Name',
-    'value'            => 'Value',
-    'description'      => 'Description',
-    'template_singular' => 'template',
-    'template_plural'   => 'templates',
-
-];

diff --git a/src/resources/lang/en/templates.php b/src/resources/lang/en/templates.php
new file mode 100644 (file)
index 0000000..f7982d3
--- /dev/null
+++ b/src/resources/lang/en/templates.php
@@ -0,0 +1,18 @@
+<?php
+
+return [
+    /*
+    |--------------------------------------------------------------------------
+    | Templates Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used for Cubist backpack
+    |
+    */
+    'name'             => 'Name',
+    'value'            => 'Value',
+    'description'      => 'Description',
+    'template_singular' => 'template',
+    'template_plural'   => 'templates',
+
+];