Skip to content

Commit

Permalink
Revert "Supports ever changing lang folder (#170)"
Browse files Browse the repository at this point in the history
This reverts commit 9e570ee.
  • Loading branch information
rmariuzzo committed Aug 26, 2022
1 parent 9e570ee commit c819424
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 20 deletions.
5 changes: 0 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ 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 @@ -94,10 +93,6 @@ 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
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,11 @@ public function register()

$files = $app['files'];

$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';
}
if ($laravelMajorVersion === 4) {
$langs = $app['path.base'].'/app/lang';
} elseif ($laravelMajorVersion >= 5) {
$langs = $app['path.base'].'/resources/lang';
}
$langs = $app['path.base'].$languagePath;

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

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

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

0 comments on commit c819424

Please sign in to comment.