From 69f8acd0e09aea71bf5b2748359f5fd3c6dd83c3 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Wed, 21 Oct 2015 11:36:49 +1030
Subject: [PATCH] Translate basic HTML views

app('view') call to set translator is temporary. See #189
---
 .../core/src/Http/Controller/AbstractClientController.php   | 2 ++
 framework/core/views/content.blade.php                      | 4 ++--
 framework/core/views/discussion.blade.php                   | 6 +++---
 framework/core/views/index.blade.php                        | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/framework/core/src/Http/Controller/AbstractClientController.php b/framework/core/src/Http/Controller/AbstractClientController.php
index 7bd942f30..a69299fff 100644
--- a/framework/core/src/Http/Controller/AbstractClientController.php
+++ b/framework/core/src/Http/Controller/AbstractClientController.php
@@ -164,6 +164,8 @@ abstract class AbstractClientController extends AbstractHtmlController
             $localeCompiler->setTranslations($translations);
         }
 
+        app('view')->share('translator', $this->locales->getTranslator());
+
         return $view;
     }
 
diff --git a/framework/core/views/content.blade.php b/framework/core/views/content.blade.php
index 2eec7e686..c342fe46e 100644
--- a/framework/core/views/content.blade.php
+++ b/framework/core/views/content.blade.php
@@ -2,9 +2,9 @@
 <div class="Alert">
     <div class="container">
         @if ($noJs)
-            Something went wrong while trying to load the full version of this site.
+            {{ $translator->trans('core.basic.load_error_message') }}
         @else
-            This site is best viewed in a modern browser with JavaScript enabled.
+            {{ $translator->trans('core.basic.javascript_disabled_message') }}
         @endif
     </div>
 </div>
diff --git a/framework/core/views/discussion.blade.php b/framework/core/views/discussion.blade.php
index d5b73831e..f5dc4b680 100644
--- a/framework/core/views/discussion.blade.php
+++ b/framework/core/views/discussion.blade.php
@@ -9,7 +9,7 @@ $postsCount = count($discussion->relationships->posts->data);
         @foreach ($posts as $post)
             <div>
                 <?php $user = $getResource($post->relationships->user->data); ?>
-                <h3>{{ $user ? $user->attributes->username : '[deleted]' }}</h3>
+                <h3>{{ $user ? $user->attributes->username : $translator->trans('core.lib.deleted_user_text') }}</h3>
                 <div class="Post-body">
                     {!! $post->attributes->contentHtml !!}
                 </div>
@@ -20,10 +20,10 @@ $postsCount = count($discussion->relationships->posts->data);
     </div>
 
     @if ($page > 1)
-        <a href="{{ $url(['page' => $page - 1]) }}">&laquo; Previous Page</a>
+        <a href="{{ $url(['page' => $page - 1]) }}">&laquo; {{ $translator->trans('core.basic.previous_page_button') }}</a>
     @endif
 
     @if ($page < $postsCount / 20)
-        <a href="{{ $url(['page' => $page + 1]) }}">Next Page &raquo;</a>
+        <a href="{{ $url(['page' => $page + 1]) }}">{{ $translator->trans('core.basic.next_page_button') }} &raquo;</a>
     @endif
 </div>
diff --git a/framework/core/views/index.blade.php b/framework/core/views/index.blade.php
index 8d3f1e997..6c8d9729f 100644
--- a/framework/core/views/index.blade.php
+++ b/framework/core/views/index.blade.php
@@ -2,7 +2,7 @@
 $url = app('Flarum\Forum\UrlGenerator');
 ?>
 <div class="container">
-    <h2>All Discussions</h2>
+    <h2>{{ $translator->trans('core.ref.all_discussions') }}</h2>
 
     <ul>
         @foreach ($document->data as $discussion)
@@ -16,5 +16,5 @@ $url = app('Flarum\Forum\UrlGenerator');
         @endforeach
     </ul>
 
-    <a href="{{ $url->toRoute('index') }}?page={{ $page + 1 }}">Next Page &raquo;</a>
+    <a href="{{ $url->toRoute('index') }}?page={{ $page + 1 }}">{{ $translator->trans('core.basic.next_page_button') }} &raquo;</a>
 </div>