fix #7225: change way we do i18n for contrib/ resource files

3 files changed, 16 insertions, 15 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index b7275ee..70a2b7f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -17,7 +17,6 @@ src/anastasis/anastasis-gtk_handle-core-secret-changed.c
 src/anastasis/anastasis-gtk_handle-core-secret-name-changed.c
 src/anastasis/anastasis-gtk_handle-country-activated.c
 src/anastasis/anastasis-gtk_handle-country-unselected.c
-src/anastasis/anastasis-gtk_handle-currency-changed.c
 src/anastasis/anastasis-gtk_handle-expiration-change.c
 src/anastasis/anastasis-gtk_handle-identity-changed.c
 src/anastasis/anastasis-gtk_handle-main-window-back-clicked.c
diff --git a/src/anastasis/anastasis-gtk_action.c b/src/anastasis/anastasis-gtk_action.c
index 2bce9b2..05a4a86 100644
--- a/src/anastasis/anastasis-gtk_action.c
+++ b/src/anastasis/anastasis-gtk_action.c
@@ -132,12 +132,9 @@ action_continent_selecting (void)
                           continent)
       {
         const char *name;
-        const char *name_i18n;
         struct GNUNET_JSON_Specification spec[] = {
           GNUNET_JSON_spec_string ("name",
                                    &name),
-          TALER_JSON_spec_i18n_str ("name",
-                                    &name_i18n),
           GNUNET_JSON_spec_end ()
         };
 
@@ -157,7 +154,8 @@ action_continent_selecting (void)
                                            AG_CMC_CONTINENT_NAME,
                                            name,
                                            AG_CMC_CONTINENT_NAME_I18N,
-                                           name_i18n,
+                                           dgettext ("anastasis",
+                                                     name),
                                            -1);
         GNUNET_JSON_parse_free (spec);
       }
@@ -217,8 +215,8 @@ action_country_selecting (void)
       struct GNUNET_JSON_Specification spec[] = {
         GNUNET_JSON_spec_string ("code",
                                  &code),
-        TALER_JSON_spec_i18n_str ("name",
-                                  &name),
+        GNUNET_JSON_spec_string ("name",
+                                 &name),
         GNUNET_JSON_spec_end ()
       };
 
@@ -237,7 +235,8 @@ action_country_selecting (void)
         &iter,
         -1,
         AG_CCMC_COUNTRY_NAME,
-        name,
+        dgettext ("anastasis",
+                  name),
         AG_CCMC_COUNTRY_CODE,
         code,
         -1);
@@ -537,8 +536,8 @@ action_user_attributes_collecting (void)
         GNUNET_JSON_spec_string ("name",
                                  &attr_name),
         GNUNET_JSON_spec_mark_optional (
-          TALER_JSON_spec_i18n_str ("label",
-                                    &attr_label),
+          GNUNET_JSON_spec_string ("label",
+                                   &attr_label),
           NULL),
         GNUNET_JSON_spec_end ()
       };
@@ -571,9 +570,11 @@ action_user_attributes_collecting (void)
       if (optional)
         GNUNET_asprintf (&l,
                          _ ("%s (optional)"),
-                         attr_label);
+                         dgettext ("anastasis",
+                                   attr_label));
       else
-        l = GNUNET_strdup (attr_label);
+        l = GNUNET_strdup (dgettext ("anastasis",
+                                     attr_label));
       if ( (NULL != widget_name) &&
            (NULL != w) )
       {
diff --git a/src/anastasis/anastasis-gtk_handle-print.c b/src/anastasis/anastasis-gtk_handle-print.c
index 6702dfc..c235ce2 100644
--- a/src/anastasis/anastasis-gtk_handle-print.c
+++ b/src/anastasis/anastasis-gtk_handle-print.c
@@ -87,8 +87,8 @@ print_to_file (GtkWindow *parent_window,
       {
         const char *tkey;
         struct GNUNET_JSON_Specification spec[] = {
-          TALER_JSON_spec_i18n_str ("label",
-                                    &tkey),
+          GNUNET_JSON_spec_string ("label",
+                                   &tkey),
           GNUNET_JSON_spec_end ()
         };
 
@@ -103,7 +103,8 @@ print_to_file (GtkWindow *parent_window,
         found = true;
         GNUNET_break (0 ==
                       json_object_set (uattrs,
-                                       tkey,
+                                       dgettext ("anastasis",
+                                                 tkey),
                                        av));
       }
     }