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
1=== modified file '00-FIXME'
2--- 00-FIXME 2012-08-25 08:37:11 +0000
3+++ 00-FIXME 2012-08-25 08:41:19 +0000
4@@ -63,3 +63,8 @@
5 = forum_modules/pgfulltext =
6
7 sostituito "english" con "italian"
8+
9+= forum/skins/light/templates/notifications/digest.html =
10+
11+File nel quale sono state apportate direttamente delle traduzioni.
12+Nello specifico le parole "nuove domande" e "post" invece di "posts"
13
14=== modified file 'forum/skins/light/templates/notifications/digest.html'
15--- forum/skins/light/templates/notifications/digest.html 2012-07-02 19:36:31 +0000
16+++ forum/skins/light/templates/notifications/digest.html 2012-08-25 08:41:19 +0000
17@@ -15,7 +15,7 @@
18
19 {% htmlcontent notifications/base.html %}
20 {% declare %}
21- new_questions_link = html.hyperlink(smart_unicode(app_url) + reverse('questions') + '?sort=' + _('latest'), smart_unicode(_('new questions')), style=a_style)
22+ new_questions_link = html.hyperlink(smart_unicode(app_url) + reverse('questions') + '?sort=' + _('latest'), smart_unicode(_('nuove domande')), style=a_style)
23 user_questions = digest.get_for_user(recipient)
24 subscribed_url = '%s%s' % (app_url, recipient.get_subscribed_url())
25 subscriptions_link = html.hyperlink(subscribed_url, _('subscriptions'), style=a_style)
26@@ -93,7 +93,7 @@
27
28 {% if recipient.is_superuser %}
29 {% declare %}
30- flagged_url = html.hyperlink(smart_unicode(app_url + reverse('admin_flagged_posts')), smart_unicode(str(flagged_count) + ' ' + _('posts')), style=a_style)
31+ flagged_url = html.hyperlink(smart_unicode(app_url + reverse('admin_flagged_posts')), smart_unicode(str(flagged_count) + ' ' + _('elementi')), style=a_style)
32 {% enddeclare %}
33 <p style="{{ p_style }}">
34 {% blocktrans %}

Subscribers

No one subscribed via source and target branches