gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-taler-ops-www] branch master updated (ce5ecca -> 757cd8d)


From: gnunet
Subject: [taler-taler-ops-www] branch master updated (ce5ecca -> 757cd8d)
Date: Sun, 25 Feb 2024 00:27:30 +0100

This is an automated email from the git hooks/post-receive script.

nora pushed a change to branch master
in repository taler-ops-www.

    from ce5ecca  Merge branch 'master' of git.taler.net:taler-ops-www
     new eac8023  ensure we're reading only files
     new 757cd8d  ensure static dirs for individual files

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .parcelrc                         |  4 ++++
 build-system/fix-paths.mjs        |  3 ++-
 build-system/parcel-namer.cjs     | 34 ++++++++++++++++++++++++++++++++++
 build-system/parcel-resolver.cjs  |  5 +----
 locale/de/LC_MESSAGES/messages.po | 24 ++++++++++++++----------
 locale/en/LC_MESSAGES/messages.po | 12 +++++-------
 locale/fr/LC_MESSAGES/messages.po | 12 +++++-------
 locale/messages.pot               | 12 +++++-------
 8 files changed, 70 insertions(+), 36 deletions(-)
 create mode 100644 build-system/parcel-namer.cjs

diff --git a/.parcelrc b/.parcelrc
index a2e4064..7803cc2 100644
--- a/.parcelrc
+++ b/.parcelrc
@@ -3,5 +3,9 @@
   "resolvers": [
     "./build-system/parcel-resolver.cjs",
     "..."
+  ],
+  "namers": [
+    "./build-system/parcel-namer.cjs",
+    "..."
   ]
 }
diff --git a/build-system/fix-paths.mjs b/build-system/fix-paths.mjs
index d4b7109..efad840 100644
--- a/build-system/fix-paths.mjs
+++ b/build-system/fix-paths.mjs
@@ -8,7 +8,8 @@ const distDirRead = fs
   .readdirSync(distDir, {
     recursive: true,
   })
-  .map((v) => path.join(distDir, v));
+  .map((v) => path.join(distDir, v))
+  .filter((v) => fs.statSync(v).isFile());
 
 const applyTo = distDirRead.filter((file) =>
   handleExtensions.find((ext) => file.toLowerCase().endsWith(ext)),
diff --git a/build-system/parcel-namer.cjs b/build-system/parcel-namer.cjs
new file mode 100644
index 0000000..37c9e1c
--- /dev/null
+++ b/build-system/parcel-namer.cjs
@@ -0,0 +1,34 @@
+const { Namer } = require('@parcel/plugin');
+const path = require('path');
+
+const dirs = {
+  js: ['js', 'ts', 'jsx', 'tsx'],
+  css: ['css', 'scss', 'sass'],
+  images: ['png', 'jpg', 'jpeg', 'svg', 'ico', 'bmp'],
+  fonts: ['woff2', 'woff', 'ttf', 'eot'],
+};
+
+// Reverse into indexable
+const dirsByType = {};
+for (const [dir, types] of Object.entries(dirs))
+  if (typeof types === 'string') dirsByType[types] = dir;
+  else for (const type of types) dirsByType[type] = dir;
+
+// Name shit
+module.exports = new Namer({
+  name({ bundle }) {
+    if (dirsByType[bundle.type]) {
+      const { filePath } = bundle.getMainEntry();
+      const baseName = path.basename(filePath);
+      const extName = path.extname(baseName);
+      let filename = baseName.substring(0, baseName.length - extName.length);
+      if (!bundle.needsStableName) filename += '.' + bundle.hashReference;
+      filename += '.' + bundle.type;
+      const result = path.join(dirsByType[bundle.type], filename);
+      console.log('result:', result);
+      return result;
+    }
+
+    return null;
+  },
+});
diff --git a/build-system/parcel-resolver.cjs b/build-system/parcel-resolver.cjs
index e260fa3..1f66945 100644
--- a/build-system/parcel-resolver.cjs
+++ b/build-system/parcel-resolver.cjs
@@ -3,7 +3,7 @@ const path = require('path');
 const fs = require('fs');
 
 module.exports = new Resolver({
-  async resolve({ specifier }) {
+  resolve({ specifier }) {
     if (specifier.startsWith('/')) {
       const filePath = path.resolve('rendered', specifier.substring(1));
       if (fs.existsSync(filePath))
@@ -11,9 +11,6 @@ module.exports = new Resolver({
           filePath,
         };
     }
-
-    // Let the next resolver in the pipeline handle
-    // this dependency.
     return null;
   },
 });
diff --git a/locale/de/LC_MESSAGES/messages.po 
b/locale/de/LC_MESSAGES/messages.po
index 43d4106..2c5f68c 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-02-24 23:37+0100\n"
+"POT-Creation-Date: 2024-02-25 00:18+0100\n"
 "PO-Revision-Date: 2024-02-24 20:06+0000\n"
 "Last-Translator: Stefan Kügel <skuegel@web.de>\n"
 "Language-Team: German <https://weblate.taler.net/projects/taler-ops/website/";
@@ -41,7 +41,7 @@ msgid "Home"
 msgstr "Startseite"
 
 #: common/footer.j2.inc:38 common/navigation.j2.inc:46 template/fees.html.j2:3
-#: template/fees.html.j2:9 template/fees.html.j2:19
+#: template/fees.html.j2:9 template/fees.html.j2:18
 msgid "Fees"
 msgstr "Gebührenordnung"
 
@@ -120,16 +120,11 @@ msgstr "Für Händler"
 msgid "For Users"
 msgstr "Für Kunden"
 
-#: template/fees.html.j2:11
-msgid ""
-"This <b>Fee Overview</b> is waived for <b>users or merchants</b> making use "
-"of the Taler payment system for <b>eNetzBon</b>."
+#: template/fees.html.j2:10
+msgid "Diese Seite erklärt die einzelnen Gebührenarten im Taler-Bezahlsystem."
 msgstr ""
-"Diese <b>Gebührenordnung</b> hat für alle <b>Kunden und Händler</b>, die das "
-"Taler-Bezahlsystem für <b>eNetzBon</b> nutzen, <br><b>rein informativen "
-"Charakter</b> und stellt ihnen <b>keine Gebühren</b> in Rechnung."
 
-#: template/fees.html.j2:290
+#: template/fees.html.j2:269
 msgid "Costs for sending SMS to users"
 msgstr "Kosten für den Versand von SMS an Kunden"
 
@@ -538,6 +533,15 @@ msgstr ""
 msgid "Frequently Asked Questions"
 msgstr "FAQs (Frequently Asked Questions)"
 
+#~ msgid ""
+#~ "This <b>Fee Overview</b> is waived for <b>users or merchants</b> making "
+#~ "use of the Taler payment system for <b>eNetzBon</b>."
+#~ msgstr ""
+#~ "Diese <b>Gebührenordnung</b> hat für alle <b>Kunden und Händler</b>, die "
+#~ "das Taler-Bezahlsystem für <b>eNetzBon</b> nutzen, <br><b>rein "
+#~ "informativen Charakter</b> und stellt ihnen <b>keine Gebühren</b> in "
+#~ "Rechnung."
+
 #~ msgid "AGB für eNetzBon (interim!)"
 #~ msgstr "AGB für eNetzBon (interim!)"
 
diff --git a/locale/en/LC_MESSAGES/messages.po 
b/locale/en/LC_MESSAGES/messages.po
index fc959f9..9b7c983 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-02-24 23:37+0100\n"
+"POT-Creation-Date: 2024-02-25 00:18+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,7 +39,7 @@ msgid "Home"
 msgstr ""
 
 #: common/footer.j2.inc:38 common/navigation.j2.inc:46 template/fees.html.j2:3
-#: template/fees.html.j2:9 template/fees.html.j2:19
+#: template/fees.html.j2:9 template/fees.html.j2:18
 msgid "Fees"
 msgstr ""
 
@@ -107,13 +107,11 @@ msgstr ""
 msgid "For Users"
 msgstr ""
 
-#: template/fees.html.j2:11
-msgid ""
-"This <b>Fee Overview</b> is waived for <b>users or merchants</b> making use "
-"of the Taler payment system for <b>eNetzBon</b>."
+#: template/fees.html.j2:10
+msgid "Diese Seite erklärt die einzelnen Gebührenarten im Taler-Bezahlsystem."
 msgstr ""
 
-#: template/fees.html.j2:290
+#: template/fees.html.j2:269
 msgid "Costs for sending SMS to users"
 msgstr ""
 
diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index 0040187..43d8da1 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-02-24 23:37+0100\n"
+"POT-Creation-Date: 2024-02-25 00:18+0100\n"
 "PO-Revision-Date: 2024-02-12 18:13+0000\n"
 "Last-Translator: Stefan Kügel <skuegel@web.de>\n"
 "Language-Team: French <https://weblate.taler.net/projects/taler-ops/website/";
@@ -41,7 +41,7 @@ msgid "Home"
 msgstr "Accueil"
 
 #: common/footer.j2.inc:38 common/navigation.j2.inc:46 template/fees.html.j2:3
-#: template/fees.html.j2:9 template/fees.html.j2:19
+#: template/fees.html.j2:9 template/fees.html.j2:18
 msgid "Fees"
 msgstr "Frais"
 
@@ -117,13 +117,11 @@ msgstr ""
 msgid "For Users"
 msgstr ""
 
-#: template/fees.html.j2:11
-msgid ""
-"This <b>Fee Overview</b> is waived for <b>users or merchants</b> making use "
-"of the Taler payment system for <b>eNetzBon</b>."
+#: template/fees.html.j2:10
+msgid "Diese Seite erklärt die einzelnen Gebührenarten im Taler-Bezahlsystem."
 msgstr ""
 
-#: template/fees.html.j2:290
+#: template/fees.html.j2:269
 msgid "Costs for sending SMS to users"
 msgstr ""
 
diff --git a/locale/messages.pot b/locale/messages.pot
index 099c2c2..55f433b 100644
--- a/locale/messages.pot
+++ b/locale/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-02-24 23:40+0100\n"
+"POT-Creation-Date: 2024-02-25 00:18+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38,7 +38,7 @@ msgid "Home"
 msgstr ""
 
 #: common/footer.j2.inc:38 common/navigation.j2.inc:46 template/fees.html.j2:3
-#: template/fees.html.j2:9 template/fees.html.j2:19
+#: template/fees.html.j2:9 template/fees.html.j2:18
 msgid "Fees"
 msgstr ""
 
@@ -106,13 +106,11 @@ msgstr ""
 msgid "For Users"
 msgstr ""
 
-#: template/fees.html.j2:11
-msgid ""
-"This <b>Fee Overview</b> is waived for <b>users or merchants</b> making "
-"use of the Taler payment system for <b>eNetzBon</b>."
+#: template/fees.html.j2:10
+msgid "Diese Seite erklärt die einzelnen Gebührenarten im Taler-Bezahlsystem."
 msgstr ""
 
-#: template/fees.html.j2:290
+#: template/fees.html.j2:269
 msgid "Costs for sending SMS to users"
 msgstr ""
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]