sync with dev

00-FIXME

@@ -57,7 +57,14 @@ FIXME: proporre cambiamento upstream come da lp:~giuseppeterrasi/ubuntu-it-ask/l
 
 = forum/templatetags/extra_tags.py =
 FIXME: proporre cambiamento upstream come da lp:~giuseppeterrasi/ubuntu-it-ask/l18ned
+Revert parziale con modifica 64 ramo dev, attraverso questo merge  [1]
+[1] https://code.launchpad.net/~giuseppeterrasi/ubuntu-it-ask/revert-extra-tag/+merge/121304
 
 = forum_modules/pgfulltext =
 
 sostituito "english" con "italian"
+
+= forum/skins/light/templates/notifications/digest.html =
+
+File nel quale sono state apportate direttamente delle traduzioni.
+Nello specifico le parole "nuove domande" e "elementi" invece di "posts"

forum/skins/light/templates/badge.html

@@ -20,7 +20,7 @@
 </div>
 <div id="main-body" style="width:100%;margin-bottom:20px">
     <p>
-        <a href="{{badge.get_absolute_url}}" title="{{ badge.get_type_display }} : {{ badge.description }}" class="medal"><span class="badge{{ badge.type }}">&#9679;</span>&nbsp;{{ badge.name }}</a> {{ badge.description }}
+        <a href="{{badge.get_absolute_url}}" title="{{ badge.get_type_display }} {{ badge.description }}" class="medal"><span class="badge{{ badge.type }}">&#9679;</span>&nbsp;{{ badge.name }}</a> {{ badge.description }}
     </p>
     <div>
         {% if badge.awarded_count %}

forum/skins/light/templates/badges.html

@@ -23,7 +23,7 @@
             {% endif %}
             </div>
             <div class="badgeListItem">
-                <a href="{{badge.get_absolute_url}}" title="{{ badge.get_type_display }} : {{ badge.description }}" class="medal"><span class="badge{{ badge.type }}">&#9679;</span>&nbsp;{{ badge.name }}</a><strong> &#215; {{ badge.awarded_count|intcomma }}</strong>
+                <a href="{{badge.get_absolute_url}}" title="{{ badge.get_type_display }} {{ badge.description }}" class="medal"><span class="badge{{ badge.type }}">&#9679;</span>&nbsp;{{ badge.name }}</a><strong> &#215; {{ badge.awarded_count|intcomma }}</strong>
             </div>
             <p class="badgeListDescription">
                 {{ badge.description }}

forum/skins/light/templates/notifications/digest.html

@@ -15,7 +15,7 @@
 
     {% htmlcontent notifications/base.html %}
         {% declare %}
-            new_questions_link = html.hyperlink(smart_unicode(app_url) + reverse('questions') + '?sort=' + _('latest'), smart_unicode(_('new questions')), style=a_style)
+            new_questions_link = html.hyperlink(smart_unicode(app_url) + reverse('questions') + '?sort=' + _('latest'), smart_unicode(_('nuove domande')), style=a_style)
             user_questions = digest.get_for_user(recipient)
             subscribed_url = '%s%s' % (app_url, recipient.get_subscribed_url())
             subscriptions_link = html.hyperlink(subscribed_url, _('subscriptions'), style=a_style)
@@ -93,7 +93,7 @@
 
         {% if recipient.is_superuser %}
         {% declare %}
-            flagged_url = html.hyperlink(smart_unicode(app_url + reverse('admin_flagged_posts')), smart_unicode(str(flagged_count) + ' ' + _('posts')), style=a_style)
+            flagged_url = html.hyperlink(smart_unicode(app_url + reverse('admin_flagged_posts')), smart_unicode(str(flagged_count) + ' ' + _('elementi')), style=a_style)
         {% enddeclare %}
         <p style="{{ p_style }}">
             {% blocktrans %}

forum/templatetags/extra_tags.py

@@ -167,11 +167,11 @@ def diff_date(date, limen=2):
     elif days == 1:
         return _('yesterday')
     elif minutes >= 60:
-        return ungettext("%(hr)d hour ago", "%(hr)d hours ago", hours) % {'hr':hours}
+        return ungettext('%(hr)d ' + _("hour ago"), '%(hr)d ' + _("hours ago"), hours) % {'hr':hours}
     elif diff.seconds >= 60:
-        return ungettext("%(min)d min ago", "%(min)d mins ago", minutes) % {'min':minutes}
+        return ungettext('%(min)d ' + _("min ago"), '%(min)d ' + _("mins ago"), minutes) % {'min':minutes}
     else:
-        return ungettext("%(sec)d sec ago", "%(sec)d secs ago", diff.seconds) % {'sec':diff.seconds}
+        return ungettext('%(sec)d ' + _("sec ago"), '%(sec)d ' + _("secs ago"), diff.seconds) % {'sec':diff.seconds}
 
 @register.simple_tag
 def media(url):