Fix Routable's use of TranslationConfig

locomotivemtl · Feb 7, 2017 · 5258497 · 5258497
1 parent 054e54e
commit 5258497
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/src/Charcoal/Object/Content.php b/src/Charcoal/Object/Content.php
@@ -18,7 +18,7 @@
 // From `charcoal-translation`
 use Charcoal\Translator\TranslatorAwareTrait;
 
-// Local namespace (`charcoal-object`) dependencies
+// From `charcoal-object`
 use Charcoal\Object\ContentInterface;
 use Charcoal\Object\RevisionableInterface;
 use Charcoal\Object\RevisionableTrait;

diff --git a/src/Charcoal/Object/RoutableTrait.php b/src/Charcoal/Object/RoutableTrait.php
@@ -11,7 +11,6 @@
 
 // From 'charcoal-translation'
 use Charcoal\Translator\Translation;
-use Charcoal\Translation\TranslationConfig;
 
 // From 'charcoal-view'
 use Charcoal\View\ViewableInterface;
@@ -223,17 +222,16 @@ public function slug()
      */
     public function generateSlug()
     {
-        $translator = TranslationConfig::instance();
-        $languages  = $translator->availableLanguages();
+        $languages  = $this->translator()->availableLocales();
         $patterns   = $this->slugPattern();
         $curSlug    = $this->slug();
         $newSlug    = [];
 
-        $origLang = $translator->currentLanguage();
+        $origLang = $this->translator()->getLocale();
         foreach ($languages as $lang) {
             $pattern = $patterns[$lang];
 
-            $translator->setCurrentLanguage($lang);
+            $this->translator()->setLocale($lang);
             if ($this->isSlugEditable() && isset($curSlug[$lang]) && strlen($curSlug[$lang])) {
                 $newSlug[$lang] = $curSlug[$lang];
             } else {
@@ -262,7 +260,7 @@ public function generateSlug()
                 }
             }
         }
-        $translator->setCurrentLanguage($origLang);
+        $this->translator()->setLocale($origLang);
 
         return $this->translator()->translation($newSlug);
     }
@@ -363,7 +361,6 @@ protected function filterRouteToken($value, $token = null)
      */
     protected function generateObjectRoute($slug = null)
     {
-        $translator = TranslationConfig::instance();
 
         if (!$slug) {
             $slug = $this->generateSlug();
@@ -373,13 +370,13 @@ protected function generateObjectRoute($slug = null)
             $slugs = $slug->all();
         }
 
-        $origLang = $translator->currentLanguage();
+        $origLang = $this->translator()->getLocale();
         foreach ($slugs as $lang => $slug) {
-            if (!$translator->hasLanguage($lang)) {
+            if (!in_array($lang, $this->translator()->availableLocales())) {
                 continue;
             }
 
-            $translator->setCurrentLanguage($lang);
+            $this->translator()->setLocale($lang);
 
             $objectRoute = $this->createRouteObject();
 
@@ -420,7 +417,7 @@ protected function generateObjectRoute($slug = null)
             }
         }
 
-        $translator->setCurrentLanguage($origLang);
+        $this->translator()->setLocale($origLang);
     }
 
     /**
@@ -432,11 +429,10 @@ protected function generateObjectRoute($slug = null)
      */
     protected function getLatestObjectRoute($lang = null)
     {
-        $translator = TranslationConfig::instance();
 
         if ($lang === null) {
             $lang = $this->translator()->getLocale();
-        } elseif (!$translator->hasLanguage($lang)) {
+        } elseif (!in_array($lang, $this->translator()->availableLocales())) {
             throw new InvalidArgumentException(sprintf(
                 'Invalid language, received %s',
                 (is_object($lang) ? get_class($lang) : gettype($lang))

diff --git a/src/Charcoal/Object/UserData.php b/src/Charcoal/Object/UserData.php
@@ -16,7 +16,7 @@
 // From `charcoal-translation`
 use Charcoal\Translator\TranslatorAwareTrait;
 
-// Local namespace (`charcoal-object`) dependency
+// From `charcoal-object`
 use Charcoal\Object\UserDataInterface;
 
 /**