update branch

forum/skins/light/templates/question.html

@@ -92,7 +92,7 @@
                 }
             </style>
         </noscript>
-        <div id="fb-root"></div>
+<div id="fb-root"></div>
     <script>
       (function(d, s, id) { var js, fjs = d.getElementsByTagName(s)[0]; 
       if (d.getElementById(id)) return; 
@@ -121,7 +121,6 @@
                             <div class="question-body">
                                 {{ question.html|safe }}
                             </div>
-
                             <div id="question-tags" class="tags-container tags">
                                 {% for tag in question.tagname_list %}
                                     <a href="{% url tag_questions tag|urlencode %}" class="post-tag tag-link-{{ tag }}"
@@ -136,8 +135,7 @@
                                     {% contributors_info question %}
                             </div>
                             {% comments question request.user %}
-
-<!-- start share content -->
+                            <!-- start share content -->
 <a href="https://twitter.com/share" class="twitter-share-button" data-lang="it" data-count="none" data-dnt="true">Tweet</a>
 <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
 <div class="g-plus" data-action="share" data-annotation="none"></div>
@@ -148,11 +146,11 @@
  po.src = 'https://apis.google.com/js/plusone.js';
  var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
  })();
-</script>
-<div class="fb-like" data-send="true" data-layout="button_count" data-width="450" data-show-faces="false"></div>
-<!-- end share content -->
-
+ </script>
+ <div class="fb-like" data-send="true" data-layout="button_count" data-width="450" data-show-faces="false"></div>
+ <!-- end share content -->
                           </div>                  
+                        
                     </td>
                 </tr>
             </table>

forum/skins/light/templates/tags.html

@@ -32,9 +32,7 @@
 <div id="searchtags">
 <p>
 {% if stag %}
-    {% blocktrans with query_tags=stag %} 
-       All tags matching query '<span class="darkred"><strong>{{ query_tags }}</strong></span>':
-    {% blocktrans %}
+    {% trans "All tags matching query" %} '<span class="darkred"><strong>{{ stag }}</strong></span>':
 {% endif %}
 {% if not tags.paginator.count %}
     <span>{% trans "Nothing found" %}</span>

forum/skins/light/templates/users/online_users.html

@@ -26,11 +26,11 @@
 <div id="main-body" style="width:100%">
     <p>
         {% if suser %}
-			{% blocktrans %}users matching query '{{suser}}':{% endblocktrans %}
+			{% blocktrans %}users matching query {{suser}}:{% endblocktrans %}
         {% endif %}
 
         {% if not users.paginator.count %}
-            <span>{% trans "Nothing found" %}</span>
+            <span>{% trans "Nothing found." %}</span>
         {% endif %}
     </p>
     <div class="userList">

forum/skins/light/templates/users/subscriptions.html

@@ -32,8 +32,8 @@
     <br/>
 
     <div id="navBar"><div class="tabsA">
-        <a href='{{ view_user.get_user_subscriptions_url }}?tab=settings' id="subscriptions_settings_button" {% if not manage_open %}class="on"{% endif %}>{% trans "Settings" %}</a>
-        <a href='{{ view_user.get_user_subscriptions_url }}?tab=manage' id="subscriptions_management_button" {% if manage_open %}class="on"{% endif %}>{% trans "Manage" %}</a>
+        <a href='{{ view_user.get_user_subscriptions_url }}?tab=settings' id="subscriptions_settings_button"  {%  if not manage_open %}class="on"{% endif %}>Settings</a>
+        <a href='{{ view_user.get_user_subscriptions_url }}?tab=manage' id="subscriptions_management_button"  {%  if manage_open %}class="on"{% endif %}>Manage</a>
     </div></div>
 
     <br/>

forum/skins/light/templates/users/users.html

@@ -26,11 +26,11 @@
 <div id="main-body" style="width:100%">
     <p>        
         {% if suser %}
-			{% blocktrans %}users matching query '{{suser}}':{% endblocktrans %}
+			{% blocktrans %}users matching query {{suser}}:{% endblocktrans %}
         {% endif %}
     
         {% if not users.paginator.count %}
-            <span>{% trans "Nothing found" %}</span>
+            <span>{% trans "Nothing found." %}</span>
         {% endif %}
     </p>
     <div class="userList">

forum/templatetags/extra_tags.py

@@ -158,20 +158,20 @@ def diff_date(date, limen=2):
     minutes = int(diff.seconds/60)
 
     if date.year != now.year:
-        return dateformat.format(date, _("d M 'y, H:i"))
+        return dateformat.format(date, 'd M \'y, H:i')
     elif days > 2:
-        return dateformat.format(date, _("d M, H:i"))
+        return dateformat.format(date, 'd M, H:i')
 
     elif days == 2:
-        return _("2 days ago")
+        return _('2 days ago')
     elif days == 1:
-        return _("yesterday")
+        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):

settings_local.py

@@ -60,4 +60,4 @@ DJANGO_VERSION = 1.3
 OSQA_DEFAULT_SKIN = 'default'
 
 # disable mysqlfulltxt and local authentication (registrations users)
-DISABLED_MODULES = ['books', 'recaptcha', 'project_badges', 'mysqlfulltxt', 'localauth', 'oauthauth', 'facebookauth']
+DISABLED_MODULES = ['books', 'recaptcha', 'project_badges', 'mysqlfulltext', 'localauth', 'oauthauth', 'facebookauth']