Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

defer language support in URIs to version 4.

This commit is contained in:
Taylor Otwell 2012-08-09 22:42:03 -05:00
parent f5123f935a
commit 79f92e57df
3 changed files with 2 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
application/config/application.php
View File

@ -94,19 +94,6 @@
'language' => 'en', 'language' => 'en',
/*
|--------------------------------------------------------------------------
| Supported Languages
|--------------------------------------------------------------------------
|
| These languages may also be supported by your application. If a request
| enters your application with a URI beginning with one of these values
| the default language will automatically be set to that language.
|
*/
'languages' => array(),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| SSL Link Generation | SSL Link Generation

42
laravel/laravel.php
View File

@ -107,46 +107,6 @@
return Event::first('404'); return Event::first('404');
}); });
/*
|--------------------------------------------------------------------------
| Gather The URI And Locales
|--------------------------------------------------------------------------
|
| When routing, we'll need to grab the URI and the supported locales for
| the route so we can properly set the language and route the request
| to the proper end-point in the application.
|
*/
$uri = URI::current();
$locales = Config::get('application.languages', array());
$locales[] = Config::get('application.language');
/*
|--------------------------------------------------------------------------
| Set The Locale Based On Route
|--------------------------------------------------------------------------
|
| If the URI starts with one of the supported languages, we will set
| the default language to match that URI segment and shorten the
| URI we'll pass to the router to not include the lang segment.
|
*/
foreach ($locales as $locale)
{
if (starts_with($uri, $locale))
{
Config::set('application.language', $locale);
$uri = trim(substr($uri, strlen($locale)), '/'); break;
}
}
if ($uri === '') $uri = '/';
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Route The Incoming Request | Route The Incoming Request
@ -158,6 +118,8 @@
| |
*/ */
$uri = URI::current();
Request::$route = Routing\Router::route(Request::method(), $uri); Request::$route = Routing\Router::route(Request::method(), $uri);
$response = Request::$route->call(); $response = Request::$route->call();

8
laravel/url.php
View File

@ -107,14 +107,6 @@ public static function to($url = '', $https = null)
$root = static::base().'/'.Config::get('application.index'); $root = static::base().'/'.Config::get('application.index');
// If multiple languages are being supported via URIs, we will append current
// language to the URI so all redirects and URLs generated include the
// current language so it is not lost on further requests.
if (count(Config::get('application.languages')) > 0)
{
$root .= '/'.Config::get('application.language');
}
// Since SSL is not often used while developing the application, we allow the // Since SSL is not often used while developing the application, we allow the
// developer to disable SSL on all framework generated links to make it more // developer to disable SSL on all framework generated links to make it more
// convenient to work with the site while developing locally. // convenient to work with the site while developing locally.