Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added support for language localization type "en", "ru", "en-us"... #170

Merged
merged 1 commit into from
Jul 15, 2015
Merged

Added support for language localization type "en", "ru", "en-us"... #170

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Added support for language localization type "en", "ru", "en-us", "ru… 
…-ru"...
  • Loading branch information
Helldar committed Jul 10, 2015
commit ab1a92295316315050532d82be9179b4afb36616
6 changes: 5 additions & 1 deletion src/SleepingOwl/Admin/AdminServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ protected function registerFormBuilder()
public function boot()
{
$this->loadViewsFrom(__DIR__ . '/../../views', 'admin');
$this->loadTranslationsFrom(__DIR__ . '/../../lang', 'admin');
$this->loadTranslationsFrom(base_path('resources/lang/'), 'admin');
$this->mergeConfigFrom(__DIR__ . '/../../config/config.php', 'admin');

$this->publishes([
Expand All @@ -81,6 +81,10 @@ public function boot()
__DIR__.'/../../../public/' => public_path('packages/sleeping-owl/admin/'),
], 'assets');

$this->publishes([
__DIR__ . '/../../lang/' => base_path('resources/lang/'),
], 'langs');

app('SleepingOwl\Admin\Helpers\StartSession')->run();

Admin::instance()->router->registerRoutes();
Expand Down