From 010aee9d1b705d6c0dbddca46ccd84705cb34e52 Mon Sep 17 00:00:00 2001 From: HB9HIL <80885850+HB9HIL@users.noreply.github.com> Date: Mon, 2 Oct 2023 16:11:04 +0200 Subject: [PATCH] Work on Translations --- application/language/english/account_lang.php | 1 + application/language/english/admin_lang.php | 3 +-- application/language/english/gridsquares_lang.php | 2 +- application/language/german/account_lang.php | 1 + application/views/interface_assets/footer.php | 2 +- application/views/logbookadvanced/index.php | 2 +- application/views/search/search_result_ajax.php | 8 ++++---- application/views/user/add.php | 2 +- application/views/user/edit.php | 2 +- application/views/view_log/partial/log.php | 4 ++-- application/views/view_log/partial/log_ajax.php | 8 ++++---- 11 files changed, 18 insertions(+), 17 deletions(-) diff --git a/application/language/english/account_lang.php b/application/language/english/account_lang.php index 645f27177..6576d003a 100644 --- a/application/language/english/account_lang.php +++ b/application/language/english/account_lang.php @@ -35,6 +35,7 @@ $lang['account_date_format'] = 'Date Format'; $lang['account_measurement_preferences'] = 'Measurement preference'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Select how you would like dates shown when logged into your account.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Choose which unit distances will be shown in'; +$lang['account_choose_cloudlog_language'] = 'Choose Cloudlog language.' $lang['account_main_menu'] = 'Main Menu'; $lang['account_show_notes_in_the_main_menu'] = 'Show notes in the main menu.'; diff --git a/application/language/english/admin_lang.php b/application/language/english/admin_lang.php index 1bc61a143..eff1d9ce8 100644 --- a/application/language/english/admin_lang.php +++ b/application/language/english/admin_lang.php @@ -16,5 +16,4 @@ $lang['admin_options'] = 'Options'; $lang['admin_create_user'] = 'Create user'; $lang['admin_delete'] = 'Delete'; $lang['admin_edit'] = 'Edit'; -$lang['admin_user_accounts'] = 'User Accounts'; - +$lang['admin_user_accounts'] = 'User Accounts'; \ No newline at end of file diff --git a/application/language/english/gridsquares_lang.php b/application/language/english/gridsquares_lang.php index 6832be440..ae5e28670 100644 --- a/application/language/english/gridsquares_lang.php +++ b/application/language/english/gridsquares_lang.php @@ -24,4 +24,4 @@ $lang['gridsquares_gridsquares'] = 'Gridsquares'; $lang['gridsquares_gridsquares_confirmed'] = 'Gridsquares confirmed'; $lang['gridsquares_gridsquares_not_confirmed'] = 'Gridsquares not confirmed'; $lang['gridsquares_gridsquares_total_worked'] = 'Total gridsquares worked'; -$lang['gridsquares_gridsquares_total_activated'] = 'Total gridsquares activated'; +$lang['gridsquares_gridsquares_total_activated'] = 'Total gridsquares activated'; \ No newline at end of file diff --git a/application/language/german/account_lang.php b/application/language/german/account_lang.php index 4c853f137..102862ff5 100644 --- a/application/language/german/account_lang.php +++ b/application/language/german/account_lang.php @@ -35,6 +35,7 @@ $lang['account_date_format'] = 'Datumsformat'; $lang['account_measurement_preferences'] = 'Entfernungsformat'; $lang['account_select_how_you_would_like_dates_shown_when_logged_into_your_account'] = 'Wähle, wie Datumsfelder angezeigt werden sollen, wenn du eingeloggt bist.'; $lang['account_choose_which_unit_distances_will_be_shown_in'] = 'Wähle, in welcher Einheit Entfernungen angezeigt werden sollen.'; +$lang['account_choose_cloudlog_language'] = 'Wähle eine Sprache für Cloudlog.'; $lang['account_main_menu'] = 'Hauptmenü'; $lang['account_show_notes_in_the_main_menu'] = 'Zeige Notizen im Hauptmenü'; diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index f72992c54..c1bae8531 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -1793,7 +1793,7 @@ $(document).ready(function(){ message: html, onshown: function(dialog) { var qsoid = $("#qsoid").text(); - $(".editButton").html(' Edit QSO'); + $(".editButton").html(''); var lat = $("#lat").text(); var long = $("#long").text(); var callsign = $("#callsign").text(); diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index 3506c2bb4..fa1f5cf73 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -387,7 +387,7 @@ $options = json_decode($options);
datetime->show ?? "true") == "true") { - echo 'Date/Time'; + echo '' . lang('general_word_datetime') . ''; } ?> de->show ?? "true") == "true") { echo 'De'; diff --git a/application/views/search/search_result_ajax.php b/application/views/search/search_result_ajax.php index 173af8c4a..f1ac93b20 100644 --- a/application/views/search/search_result_ajax.php +++ b/application/views/search/search_result_ajax.php @@ -402,16 +402,16 @@ $ci =& get_instance();
- Mark QSL Card Requested - Mark QSL Card Not Required + +
- Lookup on QRZ + - Lookup on HamQTH +
diff --git a/application/views/user/add.php b/application/views/user/add.php index c71104d9e..2c57e3940 100644 --- a/application/views/user/add.php +++ b/application/views/user/add.php @@ -199,7 +199,7 @@ } echo form_dropdown('language', $options, $language); ?> - Choose Cloudlog language. + diff --git a/application/views/user/edit.php b/application/views/user/edit.php index f6bde2da8..840ae14bb 100644 --- a/application/views/user/edit.php +++ b/application/views/user/edit.php @@ -51,7 +51,7 @@ ".$password_error.""; } else { ?> -
Leave blank to keep existing password
+
diff --git a/application/views/view_log/partial/log.php b/application/views/view_log/partial/log.php index 2eb83bdff..21da7b516 100644 --- a/application/views/view_log/partial/log.php +++ b/application/views/view_log/partial/log.php @@ -140,8 +140,8 @@
- Mark QSL Card Requested - Mark QSL Card Not Required + + diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php index e0e55f26c..abaefee9d 100644 --- a/application/views/view_log/partial/log_ajax.php +++ b/application/views/view_log/partial/log_ajax.php @@ -247,8 +247,8 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
- Mark QSL Card Requested - Mark QSL Card Not Required + + @@ -262,9 +262,9 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
- Lookup on QRZ + - Lookup on HamQTH +