Skip to content

Supports ever changing lang folder #170

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

Merged
merged 2 commits into from
Aug 26, 2022
Merged

Supports ever changing lang folder #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b638336
Allows users add the name of their lang directory
wilpat Aug 25, 2022
79b56ed
Updates README
wilpat Aug 25, 2022
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
5 changes: 5 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ The configuration will be published to `config/localization-js.php`.

You may edit this file to define the messages you need in your Javascript code. Just edit the `messages` array in the config file. **Empty messages array will include all the language files in build**.


To make only `pagination.php` and `validation.php` files to be included in build process:

```php
Expand All @@ -93,6 +94,10 @@ return [
];
```

### Specifying the path to your language folder

Out of the box, this package points to `/app/lang` in Laravel 4 or the `resources/lang` in Laravel >= 5 but you can specify where yours exists by editing the `lang_path` key in the config file.

### Using [gulp](http://gulpjs.com/) (optional)

Install [`gulp-shell`](https://github.com/sun-zheng-an/gulp-shell) and then run it directly in your `gulpfile.js`:
Expand Down
14 changes: 10 additions & 4 deletions src/Mariuzzo/LaravelJsLocalization/LaravelJsLocalizationServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,17 @@ public function register()

$files = $app['files'];

if ($laravelMajorVersion === 4) {
$langs = $app['path.base'].'/app/lang';
} elseif ($laravelMajorVersion >= 5) {
$langs = $app['path.base'].'/resources/lang';
$languagePath = $this->app['config']->get('localization-js')['lang_path'];
if (empty($languagePath)) {
if ($laravelMajorVersion === 4) {
$languagePath = 'app/lang';
$langs = $app['path.base'].'/app/lang';
} elseif ($laravelMajorVersion >= 5) {
$languagePath = 'resources/lang';
}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its better to use app()->langPath() instead of all this.

}
$langs = $app['path.base'].$languagePath;

$messages = $app['config']->get('localization-js.messages');
$generator = new Generators\LangJsGenerator($files, $langs, $messages);

Expand Down
5 changes: 5 additions & 0 deletions src/config/config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,9 @@
* The default path to use for the generated javascript.
*/
'path' => public_path('messages.js'),

/*
* The path for your laravel lang folder
*/
'lang_path' => '',
];