Bugfixes that I missed...

Extension.php

@@ -32,6 +32,8 @@ public function initialize()
 
         $locales = $this->app['config']->get('general/locales');
 
+        $this->app['htmlsnippets'] = true;
+
         if($locales){
             $this->app['config']->getFields()->addField(new Field\LocaleField());
             $this->app['twig.loader.filesystem']->addPath(__DIR__.'/assets/views');
@@ -229,17 +231,20 @@ public function translateForm($form = null)
      */
     public function getSlugFromLocale($content, $locale)
     {
-        if(is_a($content, "Bolt\Content")){
-            $query = "select value from bolt_translation where field = 'slug' and locale = ? and content_type = ? and content_type_id = ? ";
-            $stmt = $this->app['db']->prepare($query);
-            $stmt->bindValue(1, $locale);
-            $stmt->bindValue(2, $content->contenttype['slug']);
-            $stmt->bindValue(3, $content->id);
-            $stmt->execute();
-            $slug =  $stmt->fetch();
-            if(!empty($slug)){
-                return $slug['value'];
-            }
+        if(!isset($content->contenttype['slug'])){
+            return false;
+        }
+        $query = "select value from bolt_translation where field = 'slug' and locale = ? and content_type = ? and content_type_id = ? ";
+        $stmt = $this->app['db']->prepare($query);
+        $stmt->bindValue(1, $locale);
+        $stmt->bindValue(2, $content->contenttype['slug']);
+        $stmt->bindValue(3, $content->id);
+        $stmt->execute();
+        $slug =  $stmt->fetch();
+        if(isset($slug['value'])){
+            return $slug['value'];
+        }
+        if(isset($content->delocalizedValues['slug'])){
             return $content->delocalizedValues['slug'];
         }
         return false;

README.md

@@ -29,7 +29,7 @@ pages:
     slug: pages
     singular_name: Page
     singular_slug: page
-    class: Bolt\Extension\Animal\Translate\Content\LocalizedContent
+    class: \Bolt\Extension\Animal\Translate\Content\LocalizedContent
     fields:
         locale:
             type: locale

assets/views/twig/_localeswitcher.twig

@@ -6,9 +6,8 @@
 		<li {% if locale.slug == app.request.get('_locale') %}class="active"{% endif %}>
 			<a href="{{ url(
 				app.request.get('_route'), 
-				app.request.get('_route_params')|merge(
-					(newslug ? {_locale: locale.slug, slug: newslug} : {_locale: locale.slug})
-				))}}">
+				app.request.get('_route_params')|merge({_locale: locale.slug, slug: newslug ?: record.slug})
+				)}}">
 				{{ locale.label }}
 			</a>
 	{% endfor %}

src/Content/Content.php → src/Content/LocalizedContent.php

@@ -2,7 +2,6 @@
 
 namespace Bolt\Extension\Animal\Translate\Content;
 
-use Bolt\Extension\Animal\Translate\Extension as Extension;
 use Bolt\Library as Lib;
 
 class LocalizedContent extends \Bolt\Content