From 3094d24d6b0aaff53c9f7468bba94c99a865dd8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20HUBSCHER?=
Date: Sat, 25 Apr 2020 12:27:08 +0200
Subject: [PATCH] Fix history translations.
---
ihatemoney/messages.pot | 38 ++---
ihatemoney/templates/history.html | 32 ++--
.../translations/cs/LC_MESSAGES/messages.po | 41 ++---
.../translations/de/LC_MESSAGES/messages.po | 41 ++---
.../translations/el/LC_MESSAGES/messages.po | 41 ++---
.../es_419/LC_MESSAGES/messages.po | 41 ++---
.../translations/fr/LC_MESSAGES/messages.po | 149 +++++++++++------
.../translations/id/LC_MESSAGES/messages.po | 41 ++---
.../nb_NO/LC_MESSAGES/messages.po | 41 ++---
.../translations/nl/LC_MESSAGES/messages.po | 156 ++----------------
.../translations/tr/LC_MESSAGES/messages.po | 41 ++---
.../translations/uk/LC_MESSAGES/messages.po | 41 ++---
.../zh_HANS-CN/LC_MESSAGES/messages.po | 41 ++---
13 files changed, 317 insertions(+), 427 deletions(-)
diff --git a/ihatemoney/messages.pot b/ihatemoney/messages.pot
index a03f8e26..dfd1877a 100644
--- a/ihatemoney/messages.pot
+++ b/ihatemoney/messages.pot
@@ -396,23 +396,23 @@ msgstr ""
msgid "Balance"
msgstr ""
+#, python-format
msgid ""
-"This project has history disabled. New actions won't appear below. You "
-"can enable history on the"
-msgstr ""
-
-msgid "settings page"
+"\n"
+" This project has history disabled. New actions won't "
+"appear below. You can enable history on the\n"
+" settings page\n"
+" "
msgstr ""
msgid ""
-"The table below reflects actions recorded prior to disabling project "
-"history. You can "
-msgstr ""
-
-msgid "clear project history"
-msgstr ""
-
-msgid "to remove them."
+"\n"
+" The table below reflects actions recorded prior to "
+"disabling project history. You can\n"
+" clear project history to remove "
+"them.
\n"
+" "
msgstr ""
msgid ""
@@ -441,16 +441,10 @@ msgstr ""
msgid "Event"
msgstr ""
-msgid "IP address recording can be"
+msgid "IP address recording can be enabled on the settings page"
msgstr ""
-msgid "enabled"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "on the Settings page"
+msgid "IP address recording can be disabled on the settings page"
msgstr ""
msgid "From IP"
@@ -477,7 +471,7 @@ msgstr ""
msgid "reactivated"
msgstr ""
-msgid "renamed"
+msgid "renamed to"
msgstr ""
msgid "External link changed to"
diff --git a/ihatemoney/templates/history.html b/ihatemoney/templates/history.html
index 875040e4..6bd7e260 100644
--- a/ihatemoney/templates/history.html
+++ b/ihatemoney/templates/history.html
@@ -124,18 +124,25 @@
{% if current_log_pref == LoggingMode.DISABLED or (current_log_pref != LoggingMode.RECORD_IP and any_ip_addresses) %}
{% if current_log_pref == LoggingMode.DISABLED %}
-
- {{ _("This project has history disabled. New actions won't appear below. You can enable history on the") }}
- {{ _("settings page") }}
+
{% set url = url_for(".edit_project") %}
+ {% trans %}
+ This project has history disabled. New actions won't appear below. You can enable history on the
+ settings page
+ {% endtrans %}
{% if history %}
-
{{ _("The table below reflects actions recorded prior to disabling project history. You can ") }}
- {{ _("clear project history") }} {{ _("to remove them.") }}
+
+ {% trans %}
+ The table below reflects actions recorded prior to disabling project history. You can
+ clear project history to remove them.
+ {% endtrans %}
{% endif %}
{% endif %}
{% if current_log_pref != LoggingMode.RECORD_IP and any_ip_addresses %}
-
{{ _("Some entries below contain IP addresses, even though this project has IP recording disabled. ") }}
- {{ _("Delete stored IP addresses") }}
+
+ {{ _("Some entries below contain IP addresses, even though this project has IP recording disabled. ") }}
+ {{ _("Delete stored IP addresses") }}
+
{% endif %}
{% endif %}
@@ -160,10 +167,11 @@