# HG changeset patch
# User bsw
# Date 1634738670 -7200
# Node ID 4edec387855ff62cdc355216fbdfe6d559894cd7
# Parent 20c1c8cc28ba8ca23534c2eb32c28123d2c7fc68
Better handling of translation strings with links
diff -r 20c1c8cc28ba -r 4edec387855f app/main/area/_sidebar_whatcanido.lua
--- a/app/main/area/_sidebar_whatcanido.lua Wed Oct 20 15:48:51 2021 +0200
+++ b/app/main/area/_sidebar_whatcanido.lua Wed Oct 20 16:04:30 2021 +0200
@@ -71,13 +71,15 @@
ui.tag { tag = "ul", attr = { class = "ul" }, content = function ()
ui.tag { tag = "li", content = function ()
ui.tag { content = function ()
- ui.tag{ content = _"Edit your global " }
+ local text = _"Edit your global notification settings to receive updates by email."
+ local text_pre, text_link, text_post = string.match(text, "([^<]*)([^<]+)([^<]*)")
+ ui.tag{ content = text_pre }
ui.link {
module = "member", view = "settings_notification",
params = { return_to = "area", return_to_area_id = area.id },
- text = _"notification settings"
+ text = text_link
}
- ui.tag{ content = _" to receive updates by email" }
+ ui.tag{ content = text_post }
end }
end }
end }
diff -r 20c1c8cc28ba -r 4edec387855f locale/translations.de.lua
--- a/locale/translations.de.lua Wed Oct 20 15:48:51 2021 +0200
+++ b/locale/translations.de.lua Wed Oct 20 16:04:30 2021 +0200
@@ -2,7 +2,6 @@
return {
[" + file_upload_id); html = html.replace("] = false;
[" + file_upload_id); var el = document.createElement("] = false;
-[" to receive updates by email"] = " bearbeiten um Aktualisierungen per E-Mail zu erhalten";
["#{closed_ago} ago"] = "vor #{closed_ago}";
["#{count} Neutral"] = "#{count} Enthaltung";
["#{count} No"] = "#{count} Nein";
@@ -226,7 +225,7 @@
["Edit"] = "Bearbeiten";
["Edit again"] = "Nochmal bearbeiten";
["Edit voting comment"] = "Abstimmungskommentar bearbeiten";
-["Edit your global "] = "Die globalen ";
+["Edit your global notification settings to receive updates by email."] = "Die globalen Benachrichtigungseinstellungen bearbeiten, um Aktualisierungen per E-Mail zu erhalten.";
["Edit your profile data"] = "Profildaten bearbeiten";
["Eligible as winner"] = "Als Gewinner qualifiziert";
["Eligible members (#{count})"] = "Stimmberechtigte Teilnehmende (#{count})";
diff -r 20c1c8cc28ba -r 4edec387855f locale/translations.el.lua
--- a/locale/translations.el.lua Wed Oct 20 15:48:51 2021 +0200
+++ b/locale/translations.el.lua Wed Oct 20 16:04:30 2021 +0200
@@ -2,7 +2,6 @@
return {
[" + file_upload_id); html = html.replace("] = false;
[" + file_upload_id); var el = document.createElement("] = false;
-[" to receive updates by email"] = "λήψη ενημερώσεων μέσω email";
["#{closed_ago} ago"] = "#{closed_ago} πριν";
["#{count} Neutral"] = "#{count} Ουδέτεροι";
["#{count} No"] = "#{count} Όχι";
@@ -226,7 +225,7 @@
["Edit"] = "Επεξεργασία";
["Edit again"] = "Επεξεργασία ξανά";
["Edit voting comment"] = "Επεξεργασία του σχολίου της ψήφου";
-["Edit your global "] = "Επεξεργασία του ολικού";
+["Edit your global notification settings to receive updates by email."] = "Επεξεργασία του ολικού ρυθμίσεις ειδοποιήσης λήψη ενημερώσεων μέσω email.";
["Edit your profile data"] = "Επεξεργασία στοιχείων προφίλ";
["Eligible as winner"] = "Επιλέξιμος ως νικητής";
["Eligible members (#{count})"] = "Επιλέξιμα μέλη (#{count})";
diff -r 20c1c8cc28ba -r 4edec387855f locale/translations.es.lua
--- a/locale/translations.es.lua Wed Oct 20 15:48:51 2021 +0200
+++ b/locale/translations.es.lua Wed Oct 20 16:04:30 2021 +0200
@@ -2,7 +2,6 @@
return {
[" + file_upload_id); html = html.replace("] = false;
[" + file_upload_id); var el = document.createElement("] = false;
-[" to receive updates by email"] = false;
["#{closed_ago} ago"] = "hace #{closed_ago}";
["#{count} Neutral"] = "#{count} Neutral";
["#{count} No"] = "#{count} No";
@@ -214,7 +213,7 @@
["Edit"] = "Editar";
["Edit again"] = "Editar de nuevo";
["Edit voting comment"] = "Editar comentario de votación";
-["Edit your global "] = "Edita tu global";
+["Edit yournotification settings to receive updates by email."] = false;
["Edit your profile data"] = "Editar tus datos de perfil";
["Eligible as winner"] = "Elegible como ganador";
["Eligible members (#{count})"] = "Miembros elegibles (#{count})";
diff -r 20c1c8cc28ba -r 4edec387855f locale/translations.fr.lua
--- a/locale/translations.fr.lua Wed Oct 20 15:48:51 2021 +0200
+++ b/locale/translations.fr.lua Wed Oct 20 16:04:30 2021 +0200
@@ -2,7 +2,6 @@
return {
[" + file_upload_id); html = html.replace("] = false;
[" + file_upload_id); var el = document.createElement("] = false;
-[" to receive updates by email"] = " pour recevoir les actualités par email";
["#{closed_ago} ago"] = "#{closed_ago} il y a";
["#{count} Neutral"] = "#{count} Neutre";
["#{count} No"] = "#{count} Non";
@@ -226,7 +225,7 @@
["Edit"] = "Éditer";
["Edit again"] = "Éditer encore";
["Edit voting comment"] = "Éditer le commentaire du vote";
-["Edit your global "] = "Éditer le tout";
+["Edit your global notification settings to receive updates by email."] = "Éditer le tout paramètres de notification pour recevoir les actualités par email.";
["Edit your profile data"] = "Éditer les données de votre profil";
["Eligible as winner"] = "Candidato all'approvazione";
["Eligible members (#{count})"] = "Membres éligibles (#{count})";
diff -r 20c1c8cc28ba -r 4edec387855f locale/translations.it.lua
--- a/locale/translations.it.lua Wed Oct 20 15:48:51 2021 +0200
+++ b/locale/translations.it.lua Wed Oct 20 16:04:30 2021 +0200
@@ -1,6 +1,5 @@
#!/usr/bin/env lua
return {
-[" to receive updates by email"] = " di ricevere aggiornamenti via email";
["#{closed_ago} ago"] = "#{closed_ago} fa";
["#{count} Neutral"] = "#{count} Neutrali";
["#{count} No"] = "#{count} No";
@@ -231,7 +230,7 @@
["Edit"] = "Modifica";
["Edit again"] = "Modifica ancora";
["Edit voting comment"] = "Modifica il commento al voto";
-["Edit your global "] = "Modifica le tue ";
+["Edit your global notification settings to receive updates by email."] = "Modifica le tue impostazioni notifiche di ricevere aggiornamenti via email.";
["Edit your profile data"] = "Modifica i dati del tuo profilo";
["Eligible as winner"] = "Candidato all'approvazione";
["Eligible members (#{count})"] = "Utenti abilitati (#{count})";