Removed extension from translation script link

Also fixed bug causing EN translation backup to not be passed
to javascript translation system.

Closes #328

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index f4706a5c4444316429decbd23cb63673a2e2bc78..7892fe8aefa54945aaba58c29d7aaaab1f31002e 100644 (file)
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -1,10 +1,7 @@
-<?php
-
-namespace BookStack\Http\Controllers;
+<?php namespace BookStack\Http\Controllers;

 
 use Activity;
 use BookStack\Repos\EntityRepo;
 
 use Activity;
 use BookStack\Repos\EntityRepo;

-use BookStack\Http\Requests;

 use Illuminate\Http\Response;
 use Views;
 
 use Illuminate\Http\Response;
 use Views;
 


@@ -63,10 +60,10 @@ class HomeController extends Controller
             ];
             if ($locale !== 'en') {
                 $enTrans = [
             ];
             if ($locale !== 'en') {
                 $enTrans = [

-                    'common' => trans('common', [], null, 'en'),
-                    'components' => trans('components', [], null, 'en'),
-                    'entities' => trans('entities', [], null, 'en'),
-                    'errors' => trans('errors', [], null, 'en')
+                    'common' => trans('common', [], 'en'),
+                    'components' => trans('components', [], 'en'),
+                    'entities' => trans('entities', [], 'en'),
+                    'errors' => trans('errors', [], 'en')

                 ];
                 $translations = array_replace_recursive($enTrans, $translations);
             }
                 ];
                 $translations = array_replace_recursive($enTrans, $translations);
             }

diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php
index bb00ce19e9ecbbcebf343826a22396295c83a5e7..4287014c20a8afd78d80345b57ed6ab89e262ac7 100644 (file)
--- a/resources/views/base.blade.php
+++ b/resources/views/base.blade.php
@@ -17,7 +17,7 @@
     <!-- Scripts -->
     <script src="{{ baseUrl('/libs/jquery/jquery.min.js?version=2.1.4') }}"></script>
     <script src="{{ baseUrl('/libs/jquery/jquery-ui.min.js?version=1.11.4') }}"></script>
     <!-- Scripts -->
     <script src="{{ baseUrl('/libs/jquery/jquery.min.js?version=2.1.4') }}"></script>
     <script src="{{ baseUrl('/libs/jquery/jquery-ui.min.js?version=1.11.4') }}"></script>

-    <script src="{{ baseUrl('/translations.js') }}"></script>
+    <script src="{{ baseUrl('/translations') }}"></script>

 
     @yield('head')
 
 
     @yield('head')
 

diff --git a/routes/web.php b/routes/web.php
index 4bd2b4a069f6962c0504d5396c8f4f7f6f4388be..8259a633b396170a88004e147b817c11b49bda39 100644 (file)
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,6 +1,6 @@
 <?php
 
 <?php
 

-Route::get('/translations.js', 'HomeController@getTranslations');
+Route::get('/translations', 'HomeController@getTranslations');

 
 // Authenticated routes...
 Route::group(['middleware' => 'auth'], function () {
 
 // Authenticated routes...
 Route::group(['middleware' => 'auth'], function () {