diff --git a/includes/admin/class-admin.php b/includes/admin/class-admin.php index a459a2d..88e28ef 100644 --- a/includes/admin/class-admin.php +++ b/includes/admin/class-admin.php @@ -18,7 +18,7 @@ * * @package Openkaarten_Frontend_Plugin * @subpackage Openkaarten_Frontend_Plugin/Includes/Admin - * @author Acato + * @author Acato */ class Admin { /** diff --git a/includes/class-autoloader.php b/includes/class-autoloader.php index 1326225..0abcdc9 100644 --- a/includes/class-autoloader.php +++ b/includes/class-autoloader.php @@ -18,7 +18,7 @@ * @since 0.1.0 * @package Openkaarten_Frontend_Plugin * @subpackage Openkaarten_Frontend_Plugin/Includes - * @author Acato + * @author Acato */ class Autoloader { diff --git a/includes/class-base-block.php b/includes/class-base-block.php index db333e0..d0c67d9 100644 --- a/includes/class-base-block.php +++ b/includes/class-base-block.php @@ -20,7 +20,7 @@ * @since 0.1.0 * @package Openkaarten_Frontend_Plugin * @subpackage Openkaarten_Frontend_Plugin/Includes - * @author Acato + * @author Acato */ abstract class Base_Block { /** diff --git a/includes/class-i18n.php b/includes/class-i18n.php index d17a8b3..6aabc7a 100644 --- a/includes/class-i18n.php +++ b/includes/class-i18n.php @@ -22,7 +22,7 @@ * @since 0.1.0 * @package Openkaarten_Frontend_Plugin * @subpackage Openkaarten_Frontend_Plugin/Includes - * @author Acato + * @author Acato */ class I18n { @@ -35,16 +35,17 @@ public function __construct() { /** * Load the plugin text domain for translation. + * + * @return bool */ public function load_plugin_textdomain() { $path = dirname( plugin_basename( __FILE__ ), 2 ) . '/languages/'; $result = load_plugin_textdomain( 'openkaarten-frontend-plugin', false, $path ); if ( $result ) { - return; + return true; } - $locale = apply_filters( 'openkaarten_frontend_plugin_locale', get_locale(), 'openkaarten-frontend-plugin' ); - echo wp_kses_post( "Could not find $path/$locale.mo" ); + return false; } } diff --git a/includes/class-plugin.php b/includes/class-plugin.php index 8d8464f..e56e956 100644 --- a/includes/class-plugin.php +++ b/includes/class-plugin.php @@ -28,7 +28,7 @@ * @since 0.1.0 * @package Openkaarten_Frontend_Plugin * @subpackage Openkaarten_Frontend_Plugin/Includes - * @author Acato + * @author Acato */ class Plugin { diff --git a/includes/frontend/class-frontend.php b/includes/frontend/class-frontend.php index 7ecc698..cac5157 100644 --- a/includes/frontend/class-frontend.php +++ b/includes/frontend/class-frontend.php @@ -18,7 +18,7 @@ * * @package Openkaarten_Frontend_Plugin * @subpackage Openkaarten_Frontend_Plugin/Includes/Frontend - * @author Acato + * @author Acato */ class Frontend { diff --git a/languages/openkaarten-frontend-plugin-nl_NL-a6d89d02facc49d2994e1a4275125118.json b/languages/openkaarten-frontend-plugin-nl_NL-a6d89d02facc49d2994e1a4275125118.json index 21604b1..0e4b088 100644 --- a/languages/openkaarten-frontend-plugin-nl_NL-a6d89d02facc49d2994e1a4275125118.json +++ b/languages/openkaarten-frontend-plugin-nl_NL-a6d89d02facc49d2994e1a4275125118.json @@ -1 +1 @@ -{"translation-revision-date":"2024-08-13 16:54+0200","generator":"WP-CLI\/2.8.1","source":"src\/blocks\/owc-openkaarten\/streetmap\/assets\/scripts\/edit.js","domain":"messages","locale_data":{"messages":{"":{"domain":"messages","lang":"nl_NL","plural-forms":"nplurals=2; plural=(n != 1);"},"Select the datalayers you want to display on the map":["Selecteer de datalayers die getoond dienen te worden op de kaart"],"No datalayers selected":["Geen datalayers geselecteerd"],"Select datalayers:":["Selecteer datalayers"],"Selected datalayers":["Geselecteerde datalayers"]}}} \ No newline at end of file +{"translation-revision-date":"2024-08-13 16:54+0200","generator":"WP-CLI\/2.12.0","source":"src\/blocks\/owc-openkaarten\/streetmap\/assets\/scripts\/edit.js","domain":"messages","locale_data":{"messages":{"":{"domain":"messages","lang":"nl_NL","plural-forms":"nplurals=2; plural=(n != 1);"},"Invalid URL":["Ongeldige URL"],"Error parsing nested JSON":["Fout bij het parsen van geneste JSON"],"Unexpected response format or 'datasets' is not an array.":["Onverwachte opbouw van antwoord, of 'datasets' is geen array."],"Fetching datasets failed":["Het ophalen van datasets is mislukt"],"Select the datalayers you want to display on the map":["Selecteer de datalagen die u op de kaart wilt weergeven"],"No datalayers found":["Geen datalagen gevonden"],"No datalayers selected":["Geen datalagen geselecteerd"],"URL to rest-endpoint or Domain URL":["URL naar rest-eindpunt of domein-URL"],"Select datalayers:":["Selecteer datalagen:"],"Selected datalayers":["Geselecteerde datalagen"],"URL template for tile layer":["URL-sjabloon voor tegel-laag"]}}} \ No newline at end of file diff --git a/languages/openkaarten-frontend-plugin-nl_NL.l10n.php b/languages/openkaarten-frontend-plugin-nl_NL.l10n.php new file mode 100644 index 0000000..a62eb0c --- /dev/null +++ b/languages/openkaarten-frontend-plugin-nl_NL.l10n.php @@ -0,0 +1,2 @@ +'openkaarten-frontend-plugin','plural-forms'=>NULL,'language'=>'nl_NL','project-id-version'=>'OpenKaarten Frontend Plugin 0.1.0','pot-creation-date'=>'2024-06-13T09:17:05+00:00','po-revision-date'=>'2024-08-13 16:54+0200','x-generator'=>'Poedit 3.4.1','messages'=>['Adds OpenKaarten Blocks to the Gutenberg editor.'=>'Voegt OpenKaarten blokken toe aan de Gutenberg editor.','OpenKaarten Blocks'=>'OpenKaarten blokken','block titleOWC Openmaps Openstreet Map'=>'OpenKaarten Openstreetmap Kaart','block descriptionOWC Openmaps Openstreet Map'=>'OpenKaarten Openstreetmap Kaart','block keywordopenmaps'=>'openkaarten','block keywordmap'=>'kaart','block keywordlocations'=>'locaties']]; \ No newline at end of file diff --git a/languages/openkaarten-frontend-plugin-nl_NL.mo b/languages/openkaarten-frontend-plugin-nl_NL.mo index 75fa092..ec0cdb7 100644 Binary files a/languages/openkaarten-frontend-plugin-nl_NL.mo and b/languages/openkaarten-frontend-plugin-nl_NL.mo differ diff --git a/languages/openkaarten-frontend-plugin-nl_NL.po b/languages/openkaarten-frontend-plugin-nl_NL.po index 72aa7ef..7bcc2a0 100644 --- a/languages/openkaarten-frontend-plugin-nl_NL.po +++ b/languages/openkaarten-frontend-plugin-nl_NL.po @@ -14,27 +14,27 @@ msgstr "" "X-Domain: openkaarten-frontend-plugin\n" #. Plugin Name of the plugin -#: openkaarten-plugin.php +#: openkaarten-frontend-plugin.php msgid "OpenKaarten Frontend Plugin" msgstr "" #. Plugin URI of the plugin -#: openkaarten-plugin.php +#: openkaarten-frontend-plugin.php msgid "https://openwebconcept.nl/" msgstr "" #. Description of the plugin -#: openkaarten-plugin.php +#: openkaarten-frontend-plugin.php msgid "Adds OpenKaarten Blocks to the Gutenberg editor." msgstr "Voegt OpenKaarten blokken toe aan de Gutenberg editor." #. Author of the plugin -#: openkaarten-plugin.php +#: openkaarten-frontend-plugin.php msgid "Acato" msgstr "" #. Author URI of the plugin -#: openkaarten-plugin.php +#: openkaarten-frontend-plugin.php msgid "https://www.acato.nl" msgstr "" @@ -42,14 +42,6 @@ msgstr "" msgid "OpenKaarten Blocks" msgstr "OpenKaarten blokken" -#: openkaarten-plugin.php:64 -msgid "This plugin requires the Openkaarten Base plugin." -msgstr "Deze plugin benodigd de Openkaarten Base Plugin." - -#: openkaarten-plugin.php:64 -msgid "Openkaarten Base is not installed or active!" -msgstr "Openkaarten Base is niet geïnstalleerd of geactiveerd!" - #: src/blocks/owc-openkaarten/streetmap/block.json msgctxt "block title" msgid "OWC Openmaps Openstreet Map" @@ -85,5 +77,49 @@ msgctxt "block keyword" msgid "locations" msgstr "locaties" -#~ msgid "Select datalayers to display:" -#~ msgstr "Selecteer datalayers om te tonen" +#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:14 +#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:16 +msgid "Invalid URL" +msgstr "Ongeldige URL" + +#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:59 +msgid "Error parsing nested JSON" +msgstr "Fout bij het parsen van geneste JSON" + +#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:70 +msgid "Unexpected response format or 'datasets' is not an array." +msgstr "Onverwachte opbouw van antwoord, of 'datasets' is geen array." + +#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:76 +msgid "Fetching datasets failed" +msgstr "Het ophalen van datasets is mislukt" + +#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:95 +msgid "Select the datalayers you want to display on the map" +msgstr "Selecteer de datalagen die u op de kaart wilt weergeven" + +#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:95 +#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:156 +msgid "No datalayers found" +msgstr "Geen datalagen gevonden" + +#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:111 +#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:162 +msgid "No datalayers selected" +msgstr "Geen datalagen geselecteerd" + +#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:131 +msgid "URL to rest-endpoint or Domain URL" +msgstr "URL naar rest-eindpunt of domein-URL" + +#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:151 +msgid "Select datalayers:" +msgstr "Selecteer datalagen:" + +#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:161 +msgid "Selected datalayers" +msgstr "Geselecteerde datalagen" + +#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:166 +msgid "URL template for tile layer" +msgstr "URL-sjabloon voor tegel-laag" diff --git a/languages/openkaarten-frontend-plugin.pot b/languages/openkaarten-frontend-plugin.pot index 679ece4..4be7e22 100644 --- a/languages/openkaarten-frontend-plugin.pot +++ b/languages/openkaarten-frontend-plugin.pot @@ -1,36 +1,41 @@ -# Copyright (C) 2024 Acato +# Copyright (C) 2025 Acato # This file is distributed under the same license as the OpenKaarten Frontend Plugin plugin. msgid "" msgstr "" -"Project-Id-Version: OpenKaarten Frontend Plugin 0.1.0\n" +"Project-Id-Version: OpenKaarten Frontend Plugin 0.2.0\n" "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/openkaarten-frontend-plugin\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2024-08-13T14:51:28+00:00\n" +"POT-Creation-Date: 2025-08-18T09:37:24+00:00\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"X-Generator: WP-CLI 2.8.1\n" +"X-Generator: WP-CLI 2.12.0\n" "X-Domain: openkaarten-frontend-plugin\n" #. Plugin Name of the plugin +#: openkaarten-frontend-plugin.php msgid "OpenKaarten Frontend Plugin" msgstr "" #. Plugin URI of the plugin +#: openkaarten-frontend-plugin.php msgid "https://openwebconcept.nl/" msgstr "" #. Description of the plugin +#: openkaarten-frontend-plugin.php msgid "Adds OpenKaarten Blocks to the Gutenberg editor." msgstr "" #. Author of the plugin +#: openkaarten-frontend-plugin.php msgid "Acato" msgstr "" #. Author URI of the plugin +#: openkaarten-frontend-plugin.php msgid "https://www.acato.nl" msgstr "" @@ -38,35 +43,53 @@ msgstr "" msgid "OpenKaarten Blocks" msgstr "" -#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:45 -msgid "Select the datalayers you want to display on the map" +#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:14 +#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:16 +msgid "Invalid URL" msgstr "" -#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:61 -#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:112 -msgid "No datalayers selected" +#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:59 +msgid "Error parsing nested JSON" msgstr "" -#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:81 -msgid "URL to rest-endpoint or Domain URL" +#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:70 +msgid "Unexpected response format or 'datasets' is not an array." msgstr "" -#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:94 -msgid "Invalid URL" +#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:76 +msgid "Fetching datasets failed" msgstr "" -#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:101 -msgid "Select datalayers:" +#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:95 +msgid "Select the datalayers you want to display on the map" msgstr "" -#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:106 +#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:95 +#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:156 msgid "No datalayers found" msgstr "" #: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:111 +#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:162 +msgid "No datalayers selected" +msgstr "" + +#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:131 +msgid "URL to rest-endpoint or Domain URL" +msgstr "" + +#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:151 +msgid "Select datalayers:" +msgstr "" + +#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:161 msgid "Selected datalayers" msgstr "" +#: src/blocks/owc-openkaarten/streetmap/assets/scripts/edit.js:166 +msgid "URL template for tile layer" +msgstr "" + #: src/blocks/owc-openkaarten/streetmap/block.json msgctxt "block title" msgid "OWC Openmaps Openstreet Map" diff --git a/package.json b/package.json index f5d6dea..0a97f57 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,13 @@ "lint:js": "wp-scripts lint-js", "start": "wp-scripts start src/blocks/index.js", "start-assets": "npx mix watch", - "packages-update": "wp-scripts packages-update" + "packages-update": "wp-scripts packages-update", + "i18n": "npm run make-pot ; npm run update-po ; npm run make-mo ; npm run make-json ; npm run make-php", + "make-pot": "wp i18n make-pot . languages/openkaarten-frontend-plugin.pot --exclude=node_modules,build,languages", + "update-po": "wp i18n update-po languages/openkaarten-frontend-plugin.pot languages/", + "make-mo": "wp i18n make-mo languages/", + "make-json": "wp i18n make-json languages/ --no-purge", + "make-php": "wp i18n make-php languages/" }, "devDependencies": { "@vue/compiler-sfc": "^3.3.2", diff --git a/src/blocks/block-list.php b/src/blocks/block-list.php index 17111f9..c9253ce 100644 --- a/src/blocks/block-list.php +++ b/src/blocks/block-list.php @@ -8,7 +8,7 @@ * * @package Openkaarten_Frontend_Plugin * @subpackage Openkaarten_Frontend_Plugin/Src/Blocks - * @author Acato info@acato.nl> + * @author Acato */ return [ diff --git a/src/blocks/owc-openkaarten/streetmap/class-streetmap.php b/src/blocks/owc-openkaarten/streetmap/class-streetmap.php index 8c8b71e..8af5f5a 100644 --- a/src/blocks/owc-openkaarten/streetmap/class-streetmap.php +++ b/src/blocks/owc-openkaarten/streetmap/class-streetmap.php @@ -22,7 +22,7 @@ * @since 0.1.0 * @package Openkaarten_Frontend_Plugin * @subpackage Openkaarten_Frontend_Plugin/Src/Blocks/OWC_Openkaarten/Streetmap - * @author Acato + * @author Acato */ class Streetmap extends Base_Block { /**