Merge lp:~giuseppeterrasi-deactivatedaccount/ubuntu-it-ask/1032910 into lp:~ubuntu-it-ask/ubuntu-it-ask/dev

Proposed by Giuseppe Terrasi
Status: Merged
Merged at revision: 65
Proposed branch: lp:~giuseppeterrasi-deactivatedaccount/ubuntu-it-ask/1032910
Merge into: lp:~ubuntu-it-ask/ubuntu-it-ask/dev
Diff against target: 34 lines (+7/-2)
2 files modified
00-FIXME (+5/-0)
forum/skins/light/templates/notifications/digest.html (+2/-2)
To merge this branch: bzr merge lp:~giuseppeterrasi-deactivatedaccount/ubuntu-it-ask/1032910
Reviewer Review Type Date Requested Status
Ubuntu-it Ask Pending
Review via email: mp+121305@code.launchpad.net

Description of the change

Introduce traduzione, direttamente nel template, del digest e-mail. Nello specifico traduce la stringa "new questions" (reso nuove domande) e posts (reso elementi, in accordo con il file .po).

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '00-FIXME'
--- 00-FIXME 2012-08-25 08:37:11 +0000
+++ 00-FIXME 2012-08-25 08:41:19 +0000
@@ -63,3 +63,8 @@
63= forum_modules/pgfulltext =63= forum_modules/pgfulltext =
6464
65sostituito "english" con "italian"65sostituito "english" con "italian"
66
67= forum/skins/light/templates/notifications/digest.html =
68
69File nel quale sono state apportate direttamente delle traduzioni.
70Nello specifico le parole "nuove domande" e "post" invece di "posts"
6671
=== modified file 'forum/skins/light/templates/notifications/digest.html'
--- forum/skins/light/templates/notifications/digest.html 2012-07-02 19:36:31 +0000
+++ forum/skins/light/templates/notifications/digest.html 2012-08-25 08:41:19 +0000
@@ -15,7 +15,7 @@
1515
16 {% htmlcontent notifications/base.html %}16 {% htmlcontent notifications/base.html %}
17 {% declare %}17 {% declare %}
18 new_questions_link = html.hyperlink(smart_unicode(app_url) + reverse('questions') + '?sort=' + _('latest'), smart_unicode(_('new questions')), style=a_style)18 new_questions_link = html.hyperlink(smart_unicode(app_url) + reverse('questions') + '?sort=' + _('latest'), smart_unicode(_('nuove domande')), style=a_style)
19 user_questions = digest.get_for_user(recipient)19 user_questions = digest.get_for_user(recipient)
20 subscribed_url = '%s%s' % (app_url, recipient.get_subscribed_url())20 subscribed_url = '%s%s' % (app_url, recipient.get_subscribed_url())
21 subscriptions_link = html.hyperlink(subscribed_url, _('subscriptions'), style=a_style)21 subscriptions_link = html.hyperlink(subscribed_url, _('subscriptions'), style=a_style)
@@ -93,7 +93,7 @@
9393
94 {% if recipient.is_superuser %}94 {% if recipient.is_superuser %}
95 {% declare %}95 {% declare %}
96 flagged_url = html.hyperlink(smart_unicode(app_url + reverse('admin_flagged_posts')), smart_unicode(str(flagged_count) + ' ' + _('posts')), style=a_style)96 flagged_url = html.hyperlink(smart_unicode(app_url + reverse('admin_flagged_posts')), smart_unicode(str(flagged_count) + ' ' + _('elementi')), style=a_style)
97 {% enddeclare %}97 {% enddeclare %}
98 <p style="{{ p_style }}">98 <p style="{{ p_style }}">
99 {% blocktrans %}99 {% blocktrans %}

Subscribers

No one subscribed via source and target branches