File tree Expand file tree Collapse file tree 2 files changed +24
-5
lines changed Expand file tree Collapse file tree 2 files changed +24
-5
lines changed Original file line number Diff line number Diff line change @@ -137,13 +137,33 @@ function setLanguage({ lang, messages }: LanguageInterface): string {
137
137
/**
138
138
* It resolves the language file or data, from direct data, require or Promise.
139
139
*/
140
- function resolveLang ( callable : Function , lang : string ) : Promise < LanguageJsonFileInterface > {
141
- console . log ( 'HAS PHP' , process . env . LARAVEL_VUE_I18N_HAS_PHP ) ;
142
-
140
+ async function resolveLang ( callable : Function , lang : string ) {
141
+ const hasPhpTranslations = process . env . LARAVEL_VUE_I18N_HAS_PHP ;
143
142
const data = callable ( lang )
144
143
145
144
if ( data instanceof Promise ) {
146
- return data
145
+ if ( hasPhpTranslations ) {
146
+ const phpLang = await callable ( `php_${ lang } ` ) ;
147
+ const jsonLang = await data ;
148
+
149
+ return new Promise ( ( resolve ) => resolve ( {
150
+ default : {
151
+ ...phpLang ,
152
+ ...jsonLang
153
+ }
154
+ } ) ) ;
155
+ }
156
+
157
+ return data ;
158
+ }
159
+
160
+ if ( hasPhpTranslations ) {
161
+ return new Promise ( ( resolve ) => resolve ( {
162
+ default : {
163
+ ...data ,
164
+ ...( callable ( `php_${ lang } ` ) ) ,
165
+ }
166
+ } ) ) ;
147
167
}
148
168
149
169
return new Promise ( ( resolve ) => resolve ( { default : data } ) )
Original file line number Diff line number Diff line change @@ -35,7 +35,6 @@ mix.extend('i18n', class extends Component {
35
35
} ;
36
36
37
37
if ( hasPhpTranslations ( this . langPath ) ) {
38
- console . log ( 'has translations' ) ;
39
38
config . plugins . push ( new EnvironmentPlugin ( {
40
39
'LARAVEL_VUE_I18N_HAS_PHP' : true ,
41
40
} ) ) ;
You can’t perform that action at this time.
0 commit comments