From 524c6df15deaa7d040b954c97b90abac52bb1f7e Mon Sep 17 00:00:00 2001 From: Marcello Perathoner Date: Sun, 8 Sep 2024 18:44:37 +0200 Subject: [PATCH] change makefiles extension --- Makefile | 8 +- gis/Makefile | 2 +- Makefile.inc => include.mak | 0 package.json | 26 +- plugins/cap-collation/Makefile | 2 +- .../src/languages/capitularia.pot | 24 +- plugins/cap-collation/src/languages/de_DE.po | 24 +- plugins/cap-collation/src/languages/js.pot | 11 +- plugins/cap-collation/src/languages/php.pot | 6 +- plugins/cap-collation/src/languages/vue.pot | 8 +- plugins/cap-dynamic-menu/Makefile | 2 +- .../src/languages/capitularia.pot | 6 +- .../cap-dynamic-menu/src/languages/de_DE.po | 6 +- plugins/cap-dynamic-menu/src/languages/js.pot | 4 +- .../cap-dynamic-menu/src/languages/php.pot | 2 +- plugins/cap-file-includer/Makefile | 2 +- .../src/languages/capitularia.pot | 2 +- .../cap-file-includer/src/languages/php.pot | 2 +- plugins/cap-lib/Makefile | 2 +- plugins/cap-lib/src/languages/capitularia.pot | 20 +- plugins/cap-lib/src/languages/de_DE.po | 20 +- plugins/cap-lib/src/languages/php.pot | 20 +- plugins/cap-meta-search/Makefile | 2 +- .../class-meta-search-widget.php | 2 +- .../src/languages/capitularia.pot | 22 +- .../cap-meta-search/src/languages/de_DE.po | 22 +- plugins/cap-meta-search/src/languages/js.pot | 6 +- plugins/cap-meta-search/src/languages/php.pot | 10 +- plugins/cap-meta-search/src/languages/vue.pot | 6 +- plugins/cap-page-generator/Makefile | 2 +- .../src/languages/capitularia.pot | 54 +- .../cap-page-generator/src/languages/de_DE.po | 54 +- .../cap-page-generator/src/languages/php.pot | 54 +- plugins/{Makefile.inc => include.mak} | 4 +- pnpm-lock.yaml | 1349 ++++++++--------- server/Makefile | 2 +- themes/Capitularia/Makefile | 4 +- .../Capitularia/src/languages/capitularia.pot | 2 +- themes/Capitularia/src/languages/de_DE.po | 74 +- themes/Capitularia/src/languages/php.pot | 2 +- Variables.mak => variables.mak | 1 + 41 files changed, 894 insertions(+), 977 deletions(-) rename Makefile.inc => include.mak (100%) rename plugins/{Makefile.inc => include.mak} (74%) rename Variables.mak => variables.mak (99%) diff --git a/Makefile b/Makefile index 143fed25..416300f3 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -include Variables.mak +include variables.mak THEMES = themes/Capitularia PLUGINS = $(wildcard plugins/cap-*) @@ -11,7 +11,7 @@ clean: deploy: clean geodata-client deploy_php -deploy_php: lint mo js +deploy_php: mo js $(RSYNC) themes $(WPCONTENT) $(RSYNC) plugins $(WPCONTENT) $(RSYNC) --delete --exclude "api.conf.js" dist $(WPCONTENT) @@ -38,7 +38,7 @@ deploy_schemas: deploy_server: cd $(SERVER) && $(MAKE) deploy - $(RSYNC) Makefile* Variables.mak $(HOST_PRJ_DIR)/ + $(RSYNC) Makefile* variables.mak $(HOST_PRJ_DIR)/ $(RSYNC) solr $(HOST_PRJ_DIR)/ import_xml: import_mss import_capits @@ -126,7 +126,7 @@ solr-logs: less $(SOLR_INST)/server/logs/solr.log solr-prereq: - cp $(SOLR_PRJ)/lib/build/libs/lib.jar $(SOLR_INST)/lib/capitularia.jar + cp $(SOLR_PRJ)/lib/build/libs/capitularia-lucene-tools.jar $(SOLR_INST)/lib/ # needs VPN psql-remote: diff --git a/gis/Makefile b/gis/Makefile index 3623b15b..08d373b3 100644 --- a/gis/Makefile +++ b/gis/Makefile @@ -1,4 +1,4 @@ -include ../Variables.mak +include ../variables.mak IMPORT := cd ../server; python3 -m scripts.import_data -vv -c ./server.conf diff --git a/Makefile.inc b/include.mak similarity index 100% rename from Makefile.inc rename to include.mak diff --git a/package.json b/package.json index 9813c569..1b923e15 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "dependencies": { "@babel/runtime": "^7.25.6", "@popperjs/core": "^2.11.8", - "@wordpress/i18n": "^5.6.0", + "@wordpress/i18n": "^5.7.0", "axios": "^1.7.7", "bootstrap": "^5.3.3", "d3": "^7.9.0", @@ -32,7 +32,7 @@ "panzoom": "^9.4.3", "papaparse": "^5.4.1", "url": "^0.11.4", - "vue": "^3.4.38", + "vue": "^3.5.3", "vue-cookies": "^1.8.4", "vue-router": "^4.4.3", "vuex": "^4.1.0" @@ -42,22 +42,22 @@ "@babel/plugin-transform-runtime": "^7.25.4", "@babel/preset-env": "^7.25.4", "@eslint/eslintrc": "^3.1.0", - "@eslint/js": "^9.9.1", - "@fontsource/open-sans": "^5.0.29", + "@eslint/js": "^9.10.0", + "@fontsource/open-sans": "^5.0.30", "@fortawesome/fontawesome-free": "^6.6.0", "@types/bootstrap": "^5.2.10", "@types/lodash-es": "^4.17.12", - "@vue/compiler-sfc": "^3.4.38", + "@vue/compiler-sfc": "^3.5.3", "autoprefixer": "^10.4.20", "babel-loader": "^9.1.3", "cheerio": "1.0.0-rc.12", "chokidar": "^3.6.0", "css-loader": "^7.1.2", "easygettext": "^2.17.0", - "eslint": "^9.9.1", - "eslint-config-airbnb-base": "*", + "eslint": "^9.10.0", + "eslint-config-airbnb-base": "^15.0.0", "eslint-formatter-unix": "^8.40.0", - "eslint-plugin-vue": "^9.27.0", + "eslint-plugin-vue": "^9.28.0", "eslint-webpack-plugin": "^4.2.0", "file-loader": "^6.2.0", "glob": "^11.0.0", @@ -69,13 +69,13 @@ "jsdoc-vuejs": "^4.0.0", "jshint": "^2.13.6", "mini-css-extract-plugin": "^2.9.1", - "postcss": "^8.4.42", + "postcss": "^8.4.45", "postcss-loader": "^8.1.1", "postcss-nested": "^6.2.0", "postcss-preset-env": "^10.0.2", "prettier": "^3.3.3", - "puppeteer-core": "^23.2.1", - "sass": "^1.77.8", + "puppeteer-core": "^23.3.0", + "sass": "^1.78.0", "sass-loader": "^16.0.1", "stream-browserify": "^3.0.0", "style-loader": "^4.0.0", @@ -86,12 +86,12 @@ "vue-loader": "^17.4.2", "webpack": "^5.94.0", "webpack-cli": "^5.1.4", - "webpack-dev-server": "^5.0.4", + "webpack-dev-server": "^5.1.0", "webpack-manifest-plugin": "^5.0.0", "webpack-merge": "^6.0.1" }, "optionalDependencies": { - "sass-embedded": "^1.77.8" + "sass-embedded": "^1.78.0" }, "devDependenciesMore": { "eslint-config-airbnb": "*", diff --git a/plugins/cap-collation/Makefile b/plugins/cap-collation/Makefile index f77e46b3..da54d209 100644 --- a/plugins/cap-collation/Makefile +++ b/plugins/cap-collation/Makefile @@ -1 +1 @@ -include ../Makefile.inc +include ../include.mak diff --git a/plugins/cap-collation/src/languages/capitularia.pot b/plugins/cap-collation/src/languages/capitularia.pot index c0e2d149..489b84ec 100644 --- a/plugins/cap-collation/src/languages/capitularia.pot +++ b/plugins/cap-collation/src/languages/capitularia.pot @@ -10,7 +10,7 @@ msgstr "" "#-#-#-#-# php.pot (Capitularia 2.0) #-#-#-#-#\n" "Project-Id-Version: Capitularia 2.0\n" "Report-Msgid-Bugs-To: marcello@perathoner.de\n" -"POT-Creation-Date: 2021-07-10 15:12+0200\n" +"POT-Creation-Date: 2024-09-08 15:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,30 +29,30 @@ msgstr "" "Generated-By: easygettext\n" "Project-Id-Version: \n" -#: cap-collation.php:54 +#: cap-collation.php:53 msgid "Capitularia Collation Tool" msgstr "" -#: cap-collation.php:55 +#: cap-collation.php:54 msgid "Collates TEI files." msgstr "" -#: src/js/tools.js:128 +#: src/js/tools.js:138 msgctxt "2., 3., etc. copy of capitularies" msgid " ($1. copy)" msgstr "" -#: src/js/tools.js:129 +#: src/js/tools.js:137 msgctxt "corrected version of capitularies" msgid " (corrected)" msgstr "" -#: src/js/tools.js:132 +#: src/js/tools.js:146 src/js/tools.js:150 msgctxt "title of the edition" msgid "Edition by Boretius/Krause" msgstr "" -#: src/js/front.js:21 +#: src/js/front.js:26 msgid "el" msgstr "" @@ -61,11 +61,11 @@ msgctxt "context" msgid "msg" msgstr "" -#: src/js/front.js:10 +#: src/js/front.js:15 msgid "text" msgstr "" -#: src/js/main.vue:42 +#: src/js/main.vue:33 msgid "Add Section" msgstr "" @@ -73,7 +73,7 @@ msgstr "" msgid "Capitulary" msgstr "" -#: src/js/main.vue:72 +#: src/js/main.vue:69 msgid "Collate" msgstr "" @@ -93,7 +93,7 @@ msgstr "" msgid "Include this textual witness in the collation." msgstr "" -#: src/js/main.vue:46 +#: src/js/main.vue:39 msgid "Load Configuration" msgstr "" @@ -101,7 +101,7 @@ msgstr "" msgid "No textual witnesses found." msgstr "" -#: src/js/main.vue:58 +#: src/js/main.vue:51 msgid "Save Configuration" msgstr "" diff --git a/plugins/cap-collation/src/languages/de_DE.po b/plugins/cap-collation/src/languages/de_DE.po index ac237483..aff1f1a9 100644 --- a/plugins/cap-collation/src/languages/de_DE.po +++ b/plugins/cap-collation/src/languages/de_DE.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: @cceh/capitularia 0.1.0\n" "Report-Msgid-Bugs-To: marcello@perathoner.de\n" -"POT-Creation-Date: 2021-07-10 15:12+0200\n" +"POT-Creation-Date: 2024-09-08 15:12+0200\n" "PO-Revision-Date: 2020-11-05 18:41+0100\n" "Last-Translator: Marcello Perathoner \n" "Language-Team: German <>\n" @@ -13,30 +13,30 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.4.1\n" -#: cap-collation.php:54 +#: cap-collation.php:53 msgid "Capitularia Collation Tool" msgstr "Capitularia Kollationstool" -#: cap-collation.php:55 +#: cap-collation.php:54 msgid "Collates TEI files." msgstr "Kollationiert TEI-Dateien." -#: src/js/tools.js:128 +#: src/js/tools.js:138 msgctxt "2., 3., etc. copy of capitularies" msgid " ($1. copy)" msgstr " ($1. Kopie)" -#: src/js/tools.js:129 +#: src/js/tools.js:137 msgctxt "corrected version of capitularies" msgid " (corrected)" msgstr " (korrigiert)" -#: src/js/tools.js:132 +#: src/js/tools.js:146 src/js/tools.js:150 msgctxt "title of the edition" msgid "Edition by Boretius/Krause" msgstr "Boretius/Krause Edition" -#: src/js/front.js:21 +#: src/js/front.js:26 msgid "el" msgstr "" @@ -45,11 +45,11 @@ msgctxt "context" msgid "msg" msgstr "" -#: src/js/front.js:10 +#: src/js/front.js:15 msgid "text" msgstr "" -#: src/js/main.vue:42 +#: src/js/main.vue:33 msgid "Add Section" msgstr "Abschnitt hinzufügen" @@ -57,7 +57,7 @@ msgstr "Abschnitt hinzufügen" msgid "Capitulary" msgstr "Kapitular" -#: src/js/main.vue:72 +#: src/js/main.vue:69 msgid "Collate" msgstr "Kollationieren" @@ -77,7 +77,7 @@ msgstr "Korrekturen von anderer Hand einschließen" msgid "Include this textual witness in the collation." msgstr "Diesen Textzeugen in die Kollation einbeziehen." -#: src/js/main.vue:46 +#: src/js/main.vue:39 msgid "Load Configuration" msgstr "Konfiguration laden" @@ -85,7 +85,7 @@ msgstr "Konfiguration laden" msgid "No textual witnesses found." msgstr "Keine Textzeugen gefunden." -#: src/js/main.vue:58 +#: src/js/main.vue:51 msgid "Save Configuration" msgstr "Konfiguration speichern" diff --git a/plugins/cap-collation/src/languages/js.pot b/plugins/cap-collation/src/languages/js.pot index 97d36aaa..9b4b1dd1 100644 --- a/plugins/cap-collation/src/languages/js.pot +++ b/plugins/cap-collation/src/languages/js.pot @@ -5,22 +5,23 @@ msgstr "" "Generated-By: easygettext\n" "Project-Id-Version: \n" -#: src/js/tools.js:128 +#: src/js/tools.js:138 msgctxt "2., 3., etc. copy of capitularies" msgid " ($1. copy)" msgstr "" -#: src/js/tools.js:129 +#: src/js/tools.js:137 msgctxt "corrected version of capitularies" msgid " (corrected)" msgstr "" -#: src/js/tools.js:132 +#: src/js/tools.js:146 +#: src/js/tools.js:150 msgctxt "title of the edition" msgid "Edition by Boretius/Krause" msgstr "" -#: src/js/front.js:21 +#: src/js/front.js:26 msgid "el" msgstr "" @@ -29,6 +30,6 @@ msgctxt "context" msgid "msg" msgstr "" -#: src/js/front.js:10 +#: src/js/front.js:15 msgid "text" msgstr "" diff --git a/plugins/cap-collation/src/languages/php.pot b/plugins/cap-collation/src/languages/php.pot index 7f8b57ce..89f352b3 100644 --- a/plugins/cap-collation/src/languages/php.pot +++ b/plugins/cap-collation/src/languages/php.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Capitularia 2.0\n" "Report-Msgid-Bugs-To: marcello@perathoner.de\n" -"POT-Creation-Date: 2021-07-10 15:12+0200\n" +"POT-Creation-Date: 2024-09-08 15:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,10 +17,10 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: cap-collation.php:54 +#: cap-collation.php:53 msgid "Capitularia Collation Tool" msgstr "" -#: cap-collation.php:55 +#: cap-collation.php:54 msgid "Collates TEI files." msgstr "" diff --git a/plugins/cap-collation/src/languages/vue.pot b/plugins/cap-collation/src/languages/vue.pot index 6911ce44..9b6f70a3 100644 --- a/plugins/cap-collation/src/languages/vue.pot +++ b/plugins/cap-collation/src/languages/vue.pot @@ -5,7 +5,7 @@ msgstr "" "Generated-By: easygettext\n" "Project-Id-Version: \n" -#: src/js/main.vue:42 +#: src/js/main.vue:33 msgid "Add Section" msgstr "" @@ -13,7 +13,7 @@ msgstr "" msgid "Capitulary" msgstr "" -#: src/js/main.vue:72 +#: src/js/main.vue:69 msgid "Collate" msgstr "" @@ -33,7 +33,7 @@ msgstr "" msgid "Include this textual witness in the collation." msgstr "" -#: src/js/main.vue:46 +#: src/js/main.vue:39 msgid "Load Configuration" msgstr "" @@ -41,7 +41,7 @@ msgstr "" msgid "No textual witnesses found." msgstr "" -#: src/js/main.vue:58 +#: src/js/main.vue:51 msgid "Save Configuration" msgstr "" diff --git a/plugins/cap-dynamic-menu/Makefile b/plugins/cap-dynamic-menu/Makefile index f77e46b3..da54d209 100644 --- a/plugins/cap-dynamic-menu/Makefile +++ b/plugins/cap-dynamic-menu/Makefile @@ -1 +1 @@ -include ../Makefile.inc +include ../include.mak diff --git a/plugins/cap-dynamic-menu/src/languages/capitularia.pot b/plugins/cap-dynamic-menu/src/languages/capitularia.pot index 76c820ee..ef40e53a 100644 --- a/plugins/cap-dynamic-menu/src/languages/capitularia.pot +++ b/plugins/cap-dynamic-menu/src/languages/capitularia.pot @@ -10,7 +10,7 @@ msgstr "" "#-#-#-#-# php.pot (Capitularia 2.0) #-#-#-#-#\n" "Project-Id-Version: Capitularia 2.0\n" "Report-Msgid-Bugs-To: marcello@perathoner.de\n" -"POT-Creation-Date: 2024-08-29 22:30+0200\n" +"POT-Creation-Date: 2024-09-08 15:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -32,12 +32,12 @@ msgstr "" msgid "Build navigation menus from user-specified HTML-tags." msgstr "" -#: src/js/front.js:54 +#: src/js/front.js:52 msgctxt "context" msgid "msg" msgstr "" -#: src/js/front.js:159 +#: src/js/front.js:155 msgctxt "Checkbox label" msgid "Show line breaks" msgstr "" diff --git a/plugins/cap-dynamic-menu/src/languages/de_DE.po b/plugins/cap-dynamic-menu/src/languages/de_DE.po index 2d5172a6..0f9ee3c2 100644 --- a/plugins/cap-dynamic-menu/src/languages/de_DE.po +++ b/plugins/cap-dynamic-menu/src/languages/de_DE.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: @cceh/capitularia 0.1.0\n" "Report-Msgid-Bugs-To: marcello@perathoner.de\n" -"POT-Creation-Date: 2021-07-10 15:12+0200\n" +"POT-Creation-Date: 2024-09-08 15:12+0200\n" "PO-Revision-Date: 2020-11-24 11:37+0100\n" "Last-Translator: Marcello Perathoner \n" "Language-Team: German <>\n" @@ -27,12 +27,12 @@ msgstr "Capitularia Dynamisches Menu" msgid "Build navigation menus from user-specified HTML-tags." msgstr "Generiert Navigationsmenus aus ausgewählten HTML-Tags." -#: src/js/front.js:54 +#: src/js/front.js:52 msgctxt "context" msgid "msg" msgstr "" -#: src/js/front.js:159 +#: src/js/front.js:155 msgctxt "Checkbox label" msgid "Show line breaks" msgstr "Zeilenwechsel darstellen" diff --git a/plugins/cap-dynamic-menu/src/languages/js.pot b/plugins/cap-dynamic-menu/src/languages/js.pot index 5ba86497..96b606f0 100644 --- a/plugins/cap-dynamic-menu/src/languages/js.pot +++ b/plugins/cap-dynamic-menu/src/languages/js.pot @@ -5,12 +5,12 @@ msgstr "" "Generated-By: easygettext\n" "Project-Id-Version: \n" -#: src/js/front.js:54 +#: src/js/front.js:52 msgctxt "context" msgid "msg" msgstr "" -#: src/js/front.js:159 +#: src/js/front.js:155 msgctxt "Checkbox label" msgid "Show line breaks" msgstr "" diff --git a/plugins/cap-dynamic-menu/src/languages/php.pot b/plugins/cap-dynamic-menu/src/languages/php.pot index 2e412802..e4f46a16 100644 --- a/plugins/cap-dynamic-menu/src/languages/php.pot +++ b/plugins/cap-dynamic-menu/src/languages/php.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Capitularia 2.0\n" "Report-Msgid-Bugs-To: marcello@perathoner.de\n" -"POT-Creation-Date: 2024-08-29 22:30+0200\n" +"POT-Creation-Date: 2024-09-08 15:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/cap-file-includer/Makefile b/plugins/cap-file-includer/Makefile index f77e46b3..da54d209 100644 --- a/plugins/cap-file-includer/Makefile +++ b/plugins/cap-file-includer/Makefile @@ -1 +1 @@ -include ../Makefile.inc +include ../include.mak diff --git a/plugins/cap-file-includer/src/languages/capitularia.pot b/plugins/cap-file-includer/src/languages/capitularia.pot index 51268126..4a123735 100644 --- a/plugins/cap-file-includer/src/languages/capitularia.pot +++ b/plugins/cap-file-includer/src/languages/capitularia.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Capitularia 2.0\n" "Report-Msgid-Bugs-To: marcello@perathoner.de\n" -"POT-Creation-Date: 2023-08-19 12:58+0200\n" +"POT-Creation-Date: 2024-09-08 15:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/cap-file-includer/src/languages/php.pot b/plugins/cap-file-includer/src/languages/php.pot index 51268126..4a123735 100644 --- a/plugins/cap-file-includer/src/languages/php.pot +++ b/plugins/cap-file-includer/src/languages/php.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Capitularia 2.0\n" "Report-Msgid-Bugs-To: marcello@perathoner.de\n" -"POT-Creation-Date: 2023-08-19 12:58+0200\n" +"POT-Creation-Date: 2024-09-08 15:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/plugins/cap-lib/Makefile b/plugins/cap-lib/Makefile index f77e46b3..da54d209 100644 --- a/plugins/cap-lib/Makefile +++ b/plugins/cap-lib/Makefile @@ -1 +1 @@ -include ../Makefile.inc +include ../include.mak diff --git a/plugins/cap-lib/src/languages/capitularia.pot b/plugins/cap-lib/src/languages/capitularia.pot index 7f61d042..ed49a7c2 100644 --- a/plugins/cap-lib/src/languages/capitularia.pot +++ b/plugins/cap-lib/src/languages/capitularia.pot @@ -10,7 +10,7 @@ msgstr "" "#-#-#-#-# php.pot (Capitularia 2.0) #-#-#-#-#\n" "Project-Id-Version: Capitularia 2.0\n" "Report-Msgid-Bugs-To: marcello@perathoner.de\n" -"POT-Creation-Date: 2024-03-18 09:49+0100\n" +"POT-Creation-Date: 2024-09-08 15:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,39 +24,39 @@ msgstr "" "Generated-By: easygettext\n" "Project-Id-Version: \n" -#: cap-lib.php:60 +#: cap-lib.php:61 msgid "Capitularia Library" msgstr "" -#: cap-lib.php:61 +#: cap-lib.php:62 msgid "Library of functions for Capitularia plugins. (REQUIRED)" msgstr "" -#: class-settings-page.php:43 +#: class-settings-page.php:41 msgid "General Settings" msgstr "" -#: class-settings-page.php:50 +#: class-settings-page.php:48 msgid "FS Root" msgstr "" -#: class-settings-page.php:58 +#: class-settings-page.php:56 msgid "API Entrypoint" msgstr "" -#: class-settings-page.php:103 +#: class-settings-page.php:101 msgid "Root directory of Capitularia in the FS" msgstr "" -#: class-settings-page.php:116 +#: class-settings-page.php:114 msgid "Capitularia API Server entrypoint" msgstr "" -#: functions.php:204 +#: functions.php:285 msgctxt "Button: Save Changes in setting page" msgid "Save Changes" msgstr "" -#: functions.php:477 functions.php:499 +#: functions.php:559 functions.php:581 msgid "Settings" msgstr "" diff --git a/plugins/cap-lib/src/languages/de_DE.po b/plugins/cap-lib/src/languages/de_DE.po index 4ce91766..1d6705ae 100644 --- a/plugins/cap-lib/src/languages/de_DE.po +++ b/plugins/cap-lib/src/languages/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Capitularia 2.0\n" "Report-Msgid-Bugs-To: marcello@perathoner.de\n" -"POT-Creation-Date: 2022-06-22 13:17+0200\n" +"POT-Creation-Date: 2024-09-08 15:12+0200\n" "PO-Revision-Date: 2019-11-17 12:09+0100\n" "Last-Translator: Marcello Perathoner \n" "Language-Team: German\n" @@ -18,41 +18,41 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.2.4\n" -#: cap-lib.php:60 +#: cap-lib.php:61 msgid "Capitularia Library" msgstr "Capitularia Programmbibliothek" -#: cap-lib.php:61 +#: cap-lib.php:62 msgid "Library of functions for Capitularia plugins. (REQUIRED)" msgstr "Funktionsbibliothek für Capitularia (NOTWENDIG)." -#: class-settings-page.php:43 +#: class-settings-page.php:41 msgid "General Settings" msgstr "Allgemeine Einstellungen" -#: class-settings-page.php:50 +#: class-settings-page.php:48 #, fuzzy msgid "FS Root" msgstr "AFS Root" -#: class-settings-page.php:58 +#: class-settings-page.php:56 msgid "API Entrypoint" msgstr "API Entrypoint" -#: class-settings-page.php:103 +#: class-settings-page.php:101 #, fuzzy msgid "Root directory of Capitularia in the FS" msgstr "AFS-Wurzelverzeichnis von Capitularia" -#: class-settings-page.php:116 +#: class-settings-page.php:114 msgid "Capitularia API Server entrypoint" msgstr "Capitularia API Server Entrypoint" -#: functions.php:204 +#: functions.php:285 msgctxt "Button: Save Changes in setting page" msgid "Save Changes" msgstr "Änderungen speichern" -#: functions.php:477 functions.php:499 +#: functions.php:559 functions.php:581 msgid "Settings" msgstr "Einstellungen" diff --git a/plugins/cap-lib/src/languages/php.pot b/plugins/cap-lib/src/languages/php.pot index 7a6d6ba2..a80aa321 100644 --- a/plugins/cap-lib/src/languages/php.pot +++ b/plugins/cap-lib/src/languages/php.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Capitularia 2.0\n" "Report-Msgid-Bugs-To: marcello@perathoner.de\n" -"POT-Creation-Date: 2024-03-18 09:49+0100\n" +"POT-Creation-Date: 2024-09-08 15:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,39 +17,39 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: cap-lib.php:60 +#: cap-lib.php:61 msgid "Capitularia Library" msgstr "" -#: cap-lib.php:61 +#: cap-lib.php:62 msgid "Library of functions for Capitularia plugins. (REQUIRED)" msgstr "" -#: class-settings-page.php:43 +#: class-settings-page.php:41 msgid "General Settings" msgstr "" -#: class-settings-page.php:50 +#: class-settings-page.php:48 msgid "FS Root" msgstr "" -#: class-settings-page.php:58 +#: class-settings-page.php:56 msgid "API Entrypoint" msgstr "" -#: class-settings-page.php:103 +#: class-settings-page.php:101 msgid "Root directory of Capitularia in the FS" msgstr "" -#: class-settings-page.php:116 +#: class-settings-page.php:114 msgid "Capitularia API Server entrypoint" msgstr "" -#: functions.php:204 +#: functions.php:285 msgctxt "Button: Save Changes in setting page" msgid "Save Changes" msgstr "" -#: functions.php:477 functions.php:499 +#: functions.php:559 functions.php:581 msgid "Settings" msgstr "" diff --git a/plugins/cap-meta-search/Makefile b/plugins/cap-meta-search/Makefile index f77e46b3..da54d209 100644 --- a/plugins/cap-meta-search/Makefile +++ b/plugins/cap-meta-search/Makefile @@ -1 +1 @@ -include ../Makefile.inc +include ../include.mak diff --git a/plugins/cap-meta-search/class-meta-search-widget.php b/plugins/cap-meta-search/class-meta-search-widget.php index a23dbdd2..437b330b 100644 --- a/plugins/cap-meta-search/class-meta-search-widget.php +++ b/plugins/cap-meta-search/class-meta-search-widget.php @@ -177,7 +177,7 @@ public function widget ($args, $instance) $this->help_text = array (); echo "