Merge pull request #9 from MortenDHansen/add-cache-heater

Add cache heater

src/Console/DatabaseTranslationsCacheCommand.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace MortenDHansen\LaravelDatabaseTranslations\Console;
+
+use MortenDHansen\LaravelDatabaseTranslations\DbTrans;
+use MortenDHansen\LaravelDatabaseTranslations\Models\DatabaseLangItem;
+
+class DatabaseTranslationsCacheCommand extends \Illuminate\Console\Command
+{
+
+    protected $signature = "dbtrans:cache-rebuild";
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Purge and rebuild cache for database translations';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $groups = DatabaseLangItem::all('group')->unique('group')->pluck('group');
+        $locales = DatabaseLangItem::all('locale')->unique('locale')->pluck('locale');
+
+        // build cache keys
+
+        foreach ($groups as $group) {
+            foreach ($locales as $locale) {
+                \Cache::forget(DbTrans::getCacheKey($group, $locale));
+                DbTrans::getDatabaseTranslations($group, $locale);
+            }
+        }
+
+        return self::SUCCESS;
+    }
+
+    public function buildCacheKeys()
+    {
+        return $cacheKeys;
+    }
+}

src/DatabaseTranslationsServiceProvider.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Translation\FileLoader;
 use Illuminate\Translation\TranslationServiceProvider;
+use MortenDHansen\LaravelDatabaseTranslations\Console\DatabaseTranslationsCacheCommand;
 
 class DatabaseTranslationsServiceProvider extends TranslationServiceProvider
 {
@@ -61,6 +62,10 @@ public function boot()
             $this->publishes([
                 __DIR__ . '/../config/translations-database.php' => config_path('translations-database.php'),
             ]);
+
+            $this->commands([
+                DatabaseTranslationsCacheCommand::class
+            ]);
         }
     }
 }

src/DatabaseTranslationsTranslator.php

@@ -59,7 +59,7 @@ public function get($key, array $replace = [], $locale = null, $fallback = true)
 
         // The key was parsed, item place will be null if key is ungrouped
         if (!isset($item)) {
-            $item = $group;
+            $item = $group == '*' ? $key : $group;
             $group = '*';
         }
 
@@ -75,6 +75,10 @@ public function get($key, array $replace = [], $locale = null, $fallback = true)
 
     public function createMissingKey($group, $item, $locale)
     {
+        // That's not a key
+        if ($item === '*') {
+            return;
+        }
         DbTrans::createLanguageItem($group, $item, $locale);
         $this->loaded = [];
         $this->loadedFromDb = [];