@@ -85,7 +86,7 @@ import lodash from 'lodash'
export default {
name: 'LanguageStrings',
- props: [ 'languageStrings' ],
+ props: [ 'languageStrings', 'loadedStrings'],
components: {
ValidationProvider,
ValidationObserver,
@@ -98,19 +99,25 @@ export default {
computed: {
languageSettingHandle() {
return this.language.locale == this.languageSetting ? true : false
- }
+ },
},
data () {
return {
defaultStrings: [],
filteredStrings: [],
- loadedStrings: false,
+ loadSearch: false,
strings: undefined,
language: undefined,
searchInput: '',
languageSetting: undefined
}
},
+ watch: {
+ loadedStrings () {
+ if(this.loadedStrings)
+ this.loadData()
+ }
+ },
methods: {
updateLanguageSetting() {
@@ -148,7 +155,7 @@ export default {
},
searchStrings() {
- this.loadedStrings = false
+ this.loadSearch = false
this.filteredStrings = []
@@ -159,35 +166,35 @@ export default {
this.filteredStrings = this.defaultStrings.filter(string => string.value.toLowerCase().includes( this.searchInput.toLowerCase() ))
- this.loadedStrings = true
+ this.loadSearch = true
- }, 200)
- },
- mounted () {
+ }, 200),
+ loadData() {
- if(this.languageStrings.translated_strings) {
+ if(this.languageStrings.translated_strings) {
- this.strings = this.languageStrings.translated_strings.language_strings
+ this.strings = this.languageStrings.translated_strings.language_strings
- // Make from JSON object array of objects
- for (const [key, value] of Object.entries(this.languageStrings.default_strings)) {
- this.defaultStrings.push({
- 'key': key,
- 'value': value,
- })
+ // Make from JSON object array of objects
+ for (const [key, value] of Object.entries(this.languageStrings.default_strings)) {
+ this.defaultStrings.push({
+ 'key': key,
+ 'value': value,
+ })
+ }
+
+ this.language = {
+ 'id': this.languageStrings.translated_strings.id,
+ 'name': this.languageStrings.translated_strings.name,
+ 'locale': this.languageStrings.translated_strings.locale,
+ }
+
+ this.languageSetting = this.languageStrings.language_setting
+
+ this.filterStrings()
}
-
- this.language = {
- 'id': this.languageStrings.translated_strings.id,
- 'name': this.languageStrings.translated_strings.name,
- 'locale': this.languageStrings.translated_strings.locale,
- }
-
- this.languageSetting = this.languageStrings.language_setting
-
- this.filterStrings()
}
- }
+ },
}
@@ -206,7 +213,7 @@ export default {
}
.language-strings-wrapper {
- width: 700px;
+ width: 100%;
height: 100%;
margin: 0 auto;
display: flex;
diff --git a/routes/api.php b/routes/api.php
index a5e48b60..d4f836da 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -172,13 +172,12 @@ Route::group(['middleware' => ['auth:api', 'auth.master', 'auth.admin', 'scope:m
Route::get('/flush-cache', 'AppFunctionsController@flush_cache');
Route::group(['prefix' => 'languages'], function () {
- Route::get('/{language}/strings_i18n', 'Language\LanguageController@get_language_strings_i18n');
- Route::get('/{language}/strings', 'Language\LanguageController@get_language_strings');
- Route::patch('/{language}/string', 'Language\LanguageController@update_string');
- Route::delete('/{language}', 'Language\LanguageController@delete_language');
- Route::patch('/{language}', 'Language\LanguageController@update_language');
- Route::post('/', 'Language\LanguageController@create_language');
- Route::get('/', 'Language\LanguageController@get_languages');
+ Route::get('/{language}/strings', 'Admin\LanguageController@get_language_strings');
+ Route::patch('/{language}/string', 'Admin\LanguageController@update_string');
+ Route::delete('/{language}', 'Admin\LanguageController@delete_language');
+ Route::patch('/{language}', 'Admin\LanguageController@update_language');
+ Route::post('/', 'Admin\LanguageController@create_language');
+ Route::get('/', 'Admin\LanguageController@get_languages');
});
// Language
@@ -207,6 +206,9 @@ Route::group(['middleware' => ['auth:api', 'auth.shared', 'auth.master', 'scope:
Route::post('/upload', 'FileFunctions\EditItemsController@user_upload');
Route::post('/move', 'FileFunctions\EditItemsController@user_move');
+ //Get translate
+ Route::get('/language/{lang}', 'AppFunctionsController@get_translate');
+
//Get Emojis List
Route::get('/emojis-list', 'AppFunctionsController@get_emojis_list');
});