Fix issues with "null" locale#37
Open
gildastema wants to merge 2 commits into
Open
Conversation
Contributor
gildastema
commented
Nov 10, 2022
gildastema
commented
- when locale is null in makeMaticeObject the translations file crash
- in config i just use the lang_path() because this method already exists in laravel
- At the end i clean the comment in the service provider
gildastema
changed the title
GENL
requested changes
Jan 21, 2024
Comment on lines
+45
to
47
| $locale = $locale ?? config('app.locale'); | ||
| $translations = json_encode($this->translations($locale)); | ||
| $appLocale = $locale ?? app()->getLocale(); |
Owner
There was a problem hiding this comment.
I understans that here you want to prevent the app from crashing when the local is missing. But what's the difference between line 45 and line 47? Can we just move line 47a bit up so that we can $appLocal be used as the default language for $this->translations() ?
Owner
There was a problem hiding this comment.
From what I see in code actually, the translations() function handles properly the case where the local is null. Can you please elaborate here how to reproduce the null local issue?
|
|
||
| use Genl\Matice\Commands\TranslationsGeneratorCommand; | ||
| use Illuminate\Support\Facades\Blade; | ||
| use Illuminate\Support\Facades\File; |
Comment on lines
-22
to
-26
| // $this->loadTranslationsFrom(__DIR__.'/../resources/lang', 'matice'); | ||
| // $this->loadViewsFrom(__DIR__.'/../resources/views', 'matice'); | ||
| // $this->loadMigrationsFrom(__DIR__.'/../database/migrations'); | ||
| // $this->loadRoutesFrom(__DIR__.'/routes.php'); | ||
|
|
Owner
There was a problem hiding this comment.
They were mainly there for documenting purpose. Maybe we can keep them so that future PR makers know them easily.
Comment on lines
-32
to
-45
| // Publishing the views. | ||
| /*$this->publishes([ | ||
| __DIR__.'/../resources/views' => resource_path('views/vendor/matice'), | ||
| ], 'views');*/ | ||
|
|
||
| // Publishing assets. | ||
| /*$this->publishes([ | ||
| __DIR__.'/../resources/assets' => public_path('vendor/matice'), | ||
| ], 'assets');*/ | ||
|
|
||
| // Publishing the translation files. | ||
| /*$this->publishes([ | ||
| __DIR__.'/../resources/lang' => resource_path('lang/vendor/matice'), | ||
| ], 'lang');*/ |
Owner
There was a problem hiding this comment.
Same here, prevent as a code documentation.
GENL
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.