diff --git a/.github/workflows/compile-mo.yml b/.github/workflows/compile-mo.yml index ce60ff9a7..a07aed3c8 100644 --- a/.github/workflows/compile-mo.yml +++ b/.github/workflows/compile-mo.yml @@ -1,11 +1,11 @@ name: Compile .mo files from changed .po files on: - push: - paths: - - '**/*.po' - branches: - - 'dev' + workflow_dispatch: + # paths: + # - '**/*.po' + # branches: + # - 'dev' jobs: compile_mo: @@ -42,7 +42,7 @@ jobs: git config --global user.email "github-actions@github.com" if [ -n "$(git status --porcelain)" ]; then git add $(git ls-files --modified | grep '\.mo$') - git commit -m "Compiled .mo files" + git commit -m "Compiled .mo files (manually triggered)" git push else echo "No changes to commit" diff --git a/.github/workflows/translation.yml b/.github/workflows/translation.yml index 41235ee85..5c724f7be 100644 --- a/.github/workflows/translation.yml +++ b/.github/workflows/translation.yml @@ -1,31 +1,34 @@ -name: Run the PO generator script +name: Run the po generator script on: - workflow_dispatch: + push: + branches: + - dev jobs: build: + if: github.repository == 'wavelog/wavelog' runs-on: ubuntu-latest steps: - - name: Checkout repository - uses: actions/checkout@v4 - with: - repository: wavelog/wavelog - ref: dev + - name: Checkout repository + uses: actions/checkout@v4 + with: + repository: wavelog/wavelog + ref: dev - - name: Set up gettext - run: sudo apt-get install -y gettext + - name: Set up gettext + run: sudo apt-get install -y gettext - - name: Run the PO generator script - run: bash po_gen.sh + - name: Run the po generator script + run: bash po_gen.sh - - name: Commit changes - run: | - git config --global user.name "github-actions" - git config --global user.email "github-actions@github.com" - git add . - git commit -m "Run po_gen.sh script to update translations (manually triggered)" - git push - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Commit changes + run: | + git config --global user.name "github-actions" + git config --global user.email "github-actions@github.com" + git add . + git commit -m "Run po_gen.sh script to update translation files" + git push + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/application/controllers/Api.php b/application/controllers/Api.php index 1b3df9b9b..ac4fd1695 100644 --- a/application/controllers/Api.php +++ b/application/controllers/Api.php @@ -48,7 +48,7 @@ class API extends CI_Controller { $this->load->library('form_validation'); $this->form_validation->set_rules('api_desc', __("API Description"), 'required'); - $this->form_validation->set_rules('api_key', __("API Key is required do not change this field"), 'required'); + $this->form_validation->set_rules('api_key', __("API Key is required. Do not change this field"), 'required'); $data['api_info'] = $this->api_model->key_description($key); diff --git a/application/locale/bg_BG/LC_MESSAGES/messages.po b/application/locale/bg_BG/LC_MESSAGES/messages.po index 6845321b8..938c5ca73 100644 --- a/application/locale/bg_BG/LC_MESSAGES/messages.po +++ b/application/locale/bg_BG/LC_MESSAGES/messages.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-06-28 22:34+0200\n" +"POT-Creation-Date: 2024-06-29 18:17+0000\n" "PO-Revision-Date: 2024-06-05 15:12+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -114,7 +114,7 @@ msgid "API Description" msgstr "" #: application/controllers/Api.php:51 -msgid "API Key is required do not change this field" +msgid "API Key is required. Do not change this field" msgstr "" #: application/controllers/Api.php:57 diff --git a/application/locale/cs_CZ/LC_MESSAGES/messages.po b/application/locale/cs_CZ/LC_MESSAGES/messages.po index 8b8ce11fe..88e0f05b3 100644 --- a/application/locale/cs_CZ/LC_MESSAGES/messages.po +++ b/application/locale/cs_CZ/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-06-28 22:34+0200\n" +"POT-Creation-Date: 2024-06-29 18:17+0000\n" "PO-Revision-Date: 2024-06-25 13:16+0000\n" "Last-Translator: Ondřej Koloničný \n" "Language-Team: Czech \n" @@ -115,7 +115,7 @@ msgid "API Description" msgstr "Popis API" #: application/controllers/Api.php:51 -msgid "API Key is required do not change this field" +msgid "API Key is required. Do not change this field" msgstr "" #: application/controllers/Api.php:57 diff --git a/application/locale/de_DE/LC_MESSAGES/messages.mo b/application/locale/de_DE/LC_MESSAGES/messages.mo index cdd8da212..621b0cd9b 100644 Binary files a/application/locale/de_DE/LC_MESSAGES/messages.mo and b/application/locale/de_DE/LC_MESSAGES/messages.mo differ diff --git a/application/locale/de_DE/LC_MESSAGES/messages.po b/application/locale/de_DE/LC_MESSAGES/messages.po index 1e7dfa045..b1c4436be 100644 --- a/application/locale/de_DE/LC_MESSAGES/messages.po +++ b/application/locale/de_DE/LC_MESSAGES/messages.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-06-28 22:34+0200\n" -"PO-Revision-Date: 2024-06-27 14:12+0000\n" +"POT-Creation-Date: 2024-06-29 18:17+0000\n" +"PO-Revision-Date: 2024-06-29 17:54+0000\n" "Last-Translator: Fabian Berg \n" "Language-Team: German \n" "Language: de_DE\n" @@ -119,8 +119,8 @@ msgid "API Description" msgstr "API Beschreibung" #: application/controllers/Api.php:51 -msgid "API Key is required do not change this field" -msgstr "API Schlüssel ist erforderlich, verändere dieses Feld nicht" +msgid "API Key is required. Do not change this field" +msgstr "API Schlüssel ist notwendig. Verändere dieses Feld nicht" #: application/controllers/Api.php:57 msgid "Edit API Description" @@ -9465,6 +9465,9 @@ msgstr "QSOs als 'Nach QO-100 Dx Club exportiert' markieren" msgid "The QSOs are marked as exported to QO-100 Dx Club." msgstr "Die QSOs wurden als 'zu QO-100 Dx Club exportiert' markiert." +#~ msgid "API Key is required do not change this field" +#~ msgstr "API Schlüssel ist erforderlich, verändere dieses Feld nicht" + #~ msgid "This checks the folders Wavelog uses are read and writeable by PHP." #~ msgstr "Prüft, ob die von Wavelog benutzten Verzeichnisse für PHP schreib und lesbar sind." diff --git a/application/locale/el_GR/LC_MESSAGES/messages.po b/application/locale/el_GR/LC_MESSAGES/messages.po index 7967ed0d9..dd9770443 100644 --- a/application/locale/el_GR/LC_MESSAGES/messages.po +++ b/application/locale/el_GR/LC_MESSAGES/messages.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-06-28 22:34+0200\n" +"POT-Creation-Date: 2024-06-29 18:17+0000\n" "PO-Revision-Date: 2024-06-05 15:13+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -114,7 +114,7 @@ msgid "API Description" msgstr "" #: application/controllers/Api.php:51 -msgid "API Key is required do not change this field" +msgid "API Key is required. Do not change this field" msgstr "" #: application/controllers/Api.php:57 diff --git a/application/locale/es_ES/LC_MESSAGES/messages.mo b/application/locale/es_ES/LC_MESSAGES/messages.mo index 9d020bfa7..0d68e61f1 100644 Binary files a/application/locale/es_ES/LC_MESSAGES/messages.mo and b/application/locale/es_ES/LC_MESSAGES/messages.mo differ diff --git a/application/locale/es_ES/LC_MESSAGES/messages.po b/application/locale/es_ES/LC_MESSAGES/messages.po index c49c4f664..d47cd8919 100644 --- a/application/locale/es_ES/LC_MESSAGES/messages.po +++ b/application/locale/es_ES/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-06-28 22:34+0200\n" +"POT-Creation-Date: 2024-06-29 18:17+0000\n" "PO-Revision-Date: 2024-06-28 20:16+0000\n" "Last-Translator: CieNTi \n" "Language-Team: Spanish \n" @@ -115,8 +115,8 @@ msgid "API Description" msgstr "Descripción de la API" #: application/controllers/Api.php:51 -msgid "API Key is required do not change this field" -msgstr "Se requiere la API Key no cambiar este campo" +msgid "API Key is required. Do not change this field" +msgstr "" #: application/controllers/Api.php:57 msgid "Edit API Description" @@ -9458,6 +9458,9 @@ msgstr "" msgid "The QSOs are marked as exported to QO-100 Dx Club." msgstr "" +#~ msgid "API Key is required do not change this field" +#~ msgstr "Se requiere la API Key no cambiar este campo" + #~ msgid "en-GB" #~ msgstr "es-ES" diff --git a/application/locale/fi_FI/LC_MESSAGES/messages.po b/application/locale/fi_FI/LC_MESSAGES/messages.po index 785fd142e..e6c0e0726 100644 --- a/application/locale/fi_FI/LC_MESSAGES/messages.po +++ b/application/locale/fi_FI/LC_MESSAGES/messages.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-06-28 22:34+0200\n" +"POT-Creation-Date: 2024-06-29 18:17+0000\n" "PO-Revision-Date: 2024-06-05 15:14+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -114,7 +114,7 @@ msgid "API Description" msgstr "" #: application/controllers/Api.php:51 -msgid "API Key is required do not change this field" +msgid "API Key is required. Do not change this field" msgstr "" #: application/controllers/Api.php:57 diff --git a/application/locale/fr_FR/LC_MESSAGES/messages.mo b/application/locale/fr_FR/LC_MESSAGES/messages.mo index 47f61f7aa..7b2ab84c1 100644 Binary files a/application/locale/fr_FR/LC_MESSAGES/messages.mo and b/application/locale/fr_FR/LC_MESSAGES/messages.mo differ diff --git a/application/locale/fr_FR/LC_MESSAGES/messages.po b/application/locale/fr_FR/LC_MESSAGES/messages.po index 0a7d3d98a..026f9249b 100644 --- a/application/locale/fr_FR/LC_MESSAGES/messages.po +++ b/application/locale/fr_FR/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-06-28 22:34+0200\n" +"POT-Creation-Date: 2024-06-29 18:17+0000\n" "PO-Revision-Date: 2024-06-26 11:15+0000\n" "Last-Translator: Aurélien Barrau \n" "Language-Team: French \n" @@ -115,8 +115,8 @@ msgid "API Description" msgstr "Description de l'API" #: application/controllers/Api.php:51 -msgid "API Key is required do not change this field" -msgstr "La clé API est requise, ne modifiez pas ce champ" +msgid "API Key is required. Do not change this field" +msgstr "" #: application/controllers/Api.php:57 msgid "Edit API Description" @@ -9458,6 +9458,9 @@ msgstr "" msgid "The QSOs are marked as exported to QO-100 Dx Club." msgstr "Les QSO sont marqués comme exportés vers QO-100 Dx Club." +#~ msgid "API Key is required do not change this field" +#~ msgstr "La clé API est requise, ne modifiez pas ce champ" + #~ msgid "en-GB" #~ msgstr "fr-FR" diff --git a/application/locale/it_IT/LC_MESSAGES/messages.po b/application/locale/it_IT/LC_MESSAGES/messages.po index c79b3ba82..e32a1152c 100644 --- a/application/locale/it_IT/LC_MESSAGES/messages.po +++ b/application/locale/it_IT/LC_MESSAGES/messages.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-06-28 22:34+0200\n" +"POT-Creation-Date: 2024-06-29 18:17+0000\n" "PO-Revision-Date: 2024-06-05 12:34\n" "Last-Translator: \n" "Language-Team: Italian\n" @@ -113,7 +113,7 @@ msgid "API Description" msgstr "" #: application/controllers/Api.php:51 -msgid "API Key is required do not change this field" +msgid "API Key is required. Do not change this field" msgstr "" #: application/controllers/Api.php:57 diff --git a/application/locale/nl_NL/LC_MESSAGES/messages.po b/application/locale/nl_NL/LC_MESSAGES/messages.po index 139f0c6db..80d17fe7f 100644 --- a/application/locale/nl_NL/LC_MESSAGES/messages.po +++ b/application/locale/nl_NL/LC_MESSAGES/messages.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-06-28 22:34+0200\n" +"POT-Creation-Date: 2024-06-29 18:17+0000\n" "PO-Revision-Date: 2024-06-05 15:15+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -114,7 +114,7 @@ msgid "API Description" msgstr "" #: application/controllers/Api.php:51 -msgid "API Key is required do not change this field" +msgid "API Key is required. Do not change this field" msgstr "" #: application/controllers/Api.php:57 diff --git a/application/locale/pl_PL/LC_MESSAGES/messages.po b/application/locale/pl_PL/LC_MESSAGES/messages.po index dc0f78f39..d6bb1ff03 100644 --- a/application/locale/pl_PL/LC_MESSAGES/messages.po +++ b/application/locale/pl_PL/LC_MESSAGES/messages.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-06-28 22:34+0200\n" +"POT-Creation-Date: 2024-06-29 18:17+0000\n" "PO-Revision-Date: 2024-06-05 15:16+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -114,7 +114,7 @@ msgid "API Description" msgstr "" #: application/controllers/Api.php:51 -msgid "API Key is required do not change this field" +msgid "API Key is required. Do not change this field" msgstr "" #: application/controllers/Api.php:57 diff --git a/application/locale/ru_RU/LC_MESSAGES/messages.mo b/application/locale/ru_RU/LC_MESSAGES/messages.mo index 649b96637..dd8e55dd1 100644 Binary files a/application/locale/ru_RU/LC_MESSAGES/messages.mo and b/application/locale/ru_RU/LC_MESSAGES/messages.mo differ diff --git a/application/locale/ru_RU/LC_MESSAGES/messages.po b/application/locale/ru_RU/LC_MESSAGES/messages.po index 413998405..2e3ce370d 100644 --- a/application/locale/ru_RU/LC_MESSAGES/messages.po +++ b/application/locale/ru_RU/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-06-28 22:34+0200\n" +"POT-Creation-Date: 2024-06-29 18:17+0000\n" "PO-Revision-Date: 2024-06-27 15:50+0000\n" "Last-Translator: Michael Skolsky \n" "Language-Team: Russian \n" @@ -115,8 +115,8 @@ msgid "API Description" msgstr "Описание API" #: application/controllers/Api.php:51 -msgid "API Key is required do not change this field" -msgstr "Требуется ключ API (не изменяйте это поле)" +msgid "API Key is required. Do not change this field" +msgstr "" #: application/controllers/Api.php:57 msgid "Edit API Description" @@ -9466,6 +9466,9 @@ msgstr "Пометить QSO как экспортированные в QO-100 D msgid "The QSOs are marked as exported to QO-100 Dx Club." msgstr "QSO отмечены как экспортированные в QO-100 Dx Club." +#~ msgid "API Key is required do not change this field" +#~ msgstr "Требуется ключ API (не изменяйте это поле)" + #~ msgid "Are you sure you want delete station profile " #~ msgstr "Вы уверены, что хотите удалить профиль станции " diff --git a/application/locale/sv_SE/LC_MESSAGES/messages.po b/application/locale/sv_SE/LC_MESSAGES/messages.po index 2e0fa89ac..7dcbb75d5 100644 --- a/application/locale/sv_SE/LC_MESSAGES/messages.po +++ b/application/locale/sv_SE/LC_MESSAGES/messages.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-06-28 22:34+0200\n" +"POT-Creation-Date: 2024-06-29 18:17+0000\n" "PO-Revision-Date: 2024-06-05 15:19+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -114,7 +114,7 @@ msgid "API Description" msgstr "" #: application/controllers/Api.php:51 -msgid "API Key is required do not change this field" +msgid "API Key is required. Do not change this field" msgstr "" #: application/controllers/Api.php:57 diff --git a/application/locale/tr_TR/LC_MESSAGES/messages.po b/application/locale/tr_TR/LC_MESSAGES/messages.po index 1d2442192..afa13617f 100644 --- a/application/locale/tr_TR/LC_MESSAGES/messages.po +++ b/application/locale/tr_TR/LC_MESSAGES/messages.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-06-28 22:34+0200\n" +"POT-Creation-Date: 2024-06-29 18:17+0000\n" "PO-Revision-Date: 2024-06-05 15:20+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -114,7 +114,7 @@ msgid "API Description" msgstr "" #: application/controllers/Api.php:51 -msgid "API Key is required do not change this field" +msgid "API Key is required. Do not change this field" msgstr "" #: application/controllers/Api.php:57 diff --git a/application/locale/zh_CN/LC_MESSAGES/messages.po b/application/locale/zh_CN/LC_MESSAGES/messages.po index ced245d1d..971d53e31 100644 --- a/application/locale/zh_CN/LC_MESSAGES/messages.po +++ b/application/locale/zh_CN/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-06-28 22:34+0200\n" +"POT-Creation-Date: 2024-06-29 18:17+0000\n" "PO-Revision-Date: 2024-06-28 20:16+0000\n" "Last-Translator: Karuru \n" "Language-Team: Chinese (Simplified) \n" @@ -115,7 +115,7 @@ msgid "API Description" msgstr "API 说明" #: application/controllers/Api.php:51 -msgid "API Key is required do not change this field" +msgid "API Key is required. Do not change this field" msgstr "" #: application/controllers/Api.php:57 diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js index ea05fb441..40efd1562 100644 --- a/assets/js/sections/qso.js +++ b/assets/js/sections/qso.js @@ -63,6 +63,14 @@ $( document ).ready(function() { } }); + // Sanitize some input data + $('#callsign').on('input', function() { + $(this).val($(this).val().replace(/\s/g, '')); + }); + $('#locator').on('input', function() { + $(this).val($(this).val().replace(/\s/g, '')); + }); + $('.callsign-suggest').hide(); setRst($(".mode").val()); diff --git a/assets/lang_src/messages.pot b/assets/lang_src/messages.pot index c68c26f19..996e549ac 100644 --- a/assets/lang_src/messages.pot +++ b/assets/lang_src/messages.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-06-28 22:34+0200\n" +"POT-Creation-Date: 2024-07-01 05:26+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -114,7 +114,7 @@ msgid "API Description" msgstr "" #: application/controllers/Api.php:51 -msgid "API Key is required do not change this field" +msgid "API Key is required. Do not change this field" msgstr "" #: application/controllers/Api.php:57