[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [websites/reservoir/develop] app: enable l18n in the url as well, as requested by sheedy
From:       Ingo Malchow <imalchow () kde ! org>
Date:       2014-11-02 1:25:49
Message-ID: E1XkjvR-0007vM-4j () scm ! kde ! org
[Download RAW message or body]

Git commit 9879a36ebc287f79a9368a47472d6730ce648cc0 by Ingo Malchow.
Committed on 02/11/2014 at 01:25.
Pushed by imalchow into branch 'develop'.

enable l18n in the url as well, as requested by sheedy

M  +2    -2    app/controllers/PageController.php
M  +2    -1    app/routes.php

http://commits.kde.org/websites/reservoir/9879a36ebc287f79a9368a47472d6730ce648cc0

diff --git a/app/controllers/PageController.php b/app/controllers/PageController.php
index 4f0037b..010bb52 100644
--- a/app/controllers/PageController.php
+++ b/app/controllers/PageController.php
@@ -22,10 +22,10 @@ class PageController extends BaseController {
         return $theme->watch('index')->render();
     }
     
-    public function showPage($page)
+    public function showPage($page, $locale=null)
     {
         $theme = Theme::uses(Config::get('reservoir.theme'));
-        
+        LaravelGettext::setLocale($locale);
         if (View::exists($page))
         {
             return $theme->watch($page)->render();
diff --git a/app/routes.php b/app/routes.php
index b7d9830..0ae9282 100644
--- a/app/routes.php
+++ b/app/routes.php
@@ -18,7 +18,8 @@ Route::get('/lang/{locale?}', [
     'uses'=>'PageController@changeLang'
 ]);
 
-Route::get('{page}', 'PageController@showPage')->where('page', '.+'); 
+Route::get('{page}/lang/{locale?}', 'PageController@showPage')->where('page', '.+');
+Route::get('{page}', 'PageController@showPage')->where('page', '.+');
 
 App::missing(function($exception)
 {
[prev in list] [next in list] [prev in thread] [next in thread]