Browse Source

Fixes in new templates.

Ralfp 12 years ago
parent
commit
fdaaa4b184

+ 2 - 2
templates/sora/newsfeed.html

@@ -13,9 +13,9 @@
 
 {% if follows %}
 <p class="lead">{% trans count=follows|length -%}
-    You are following one member, see what he posted recently:
+    You are following one member, find out what he posted recently:
     {%- pluralize -%}
-    You are following {{ count }} members, see what they posted recently:
+    You are following {{ count }} members, find out what they posted recently:
     {%- endtrans %}</p>
 {% if posts %}
 <ul class="unstyled shorts-list">

+ 3 - 6
templates/sora/profiles/content_posts.html

@@ -8,15 +8,12 @@
 {% block title %}{{ macros.page_title(_('Posts'), profile.username) }}{% endblock %}
 
 {% block tab %}
-<h2>{% trans username=profile.username %}{{ username }}'s Posts{% endtrans %} <small>{% if items_total -%}
-    {% trans count=items_total, total=items_total|intcomma, username=profile.username -%}
+<h2>{% trans username=profile.username %}{{ username }}'s posts{% endtrans %}{% if items_total %} <small>
+    {%- trans count=items_total, total=items_total|intcomma, username=profile.username -%}
     {{ username }} has one post
     {%- pluralize -%}
     {{ username }} has {{ total }} posts
-    {%- endtrans %}
-    {%- else -%}
-    {% trans username=profile.username %}{{ username }} has no posts{% endtrans %}
-    {%- endif %}</small></h2>
+    {%- endtrans -%}</small>{% endif %}</h2>
 
 {% if items_total %}
 <div class="list-nav">

+ 4 - 6
templates/sora/profiles/content_threads.html

@@ -8,15 +8,13 @@
 {% block title %}{{ macros.page_title(_('Threads'), profile.username) }}{% endblock %}
 
 {% block tab %}
-<h2>{% trans username=profile.username %}{{ username }}'s Threads{% endtrans %} <small>{% if items_total -%}
-    {% trans count=items_total, total=items_total|intcomma, username=profile.username -%}
+<h2>{% trans username=profile.username %}{{ username }}'s threads{% endtrans %}{% if items_total %} <small>
+    {%- trans count=items_total, total=items_total|intcomma, username=profile.username -%}
     {{ username }} started one thread
     {%- pluralize -%}
     {{ username }} started {{ total }} threads
-    {%- endtrans %}
-    {%- else -%}
-    {% trans username=profile.username %}{{ username }} has no threads{% endtrans %}
-    {%- endif %}</small></h2>
+    {%- endtrans -%}
+    </small>{% endif %}</h2>
 
 {% if items_total %}
 <div class="list-nav">

+ 6 - 9
templates/sora/profiles/followers.html

@@ -8,15 +8,12 @@
 {% block title %}{{ macros.page_title(_('Followers'), profile.username) }}{% endblock %}
 
 {% block tab %}
-<h2>{% trans username=profile.username %}{{ username }}'s Followers{% endtrans %} <small>{% if items_total -%}
-    {% trans count=items_total, total=items_total|intcomma, username=profile.username -%}
+<h2>{% trans username=profile.username %}{{ username }}'s followers{% endtrans %}{% if items_total %} <small>
+    {%- trans count=items_total, total=items_total|intcomma, username=profile.username -%}
     {{ username }} has one follower
     {%- pluralize -%}
     {{ username }} has {{ total }} followers
-    {%- endtrans %}
-    {%- else -%}
-    {% trans username=profile.username %}{{ username }} has no followers{% endtrans %}
-    {%- endif %}</small></h2>
+    {%- endtrans -%}</small>{% endif %}</h2>
 
 {% if items_total %}
 <div class="list-nav">
@@ -26,9 +23,9 @@
   <thead>
     <tr>
       <th colspan="4">{% trans count=items_total, total=items_total|intcomma, username=profile.username -%}
-    {{ username }} has one follower
+    {{ username }} has one follower at this time
     {%- pluralize -%}
-    {{ username }} has {{ total }} followers
+    {{ username }} has {{ total }} followers at this time
     {%- endtrans %}</th>
     </tr>
   </thead>
@@ -52,7 +49,7 @@
   {{ pager() }}
 </div>
 {% else %}
-<p class="lead">{% trans username=profile.username %}{{ username }} has no followers{% endtrans %}</p>
+<p class="lead">{% trans username=profile.username %}{{ username }} has no followers at this time{% endtrans %}</p>
 {% endif %}
 {% endblock %}
 

+ 4 - 7
templates/sora/profiles/follows.html

@@ -8,15 +8,12 @@
 {% block title %}{{ macros.page_title(_('Follows'), profile.username) }}{% endblock %}
 
 {% block tab %}
-<h2>{% trans username=profile.username %}Who {{ username }} Follows{% endtrans %} <small>{% if items_total -%}
-    {% trans count=items_total, total=items_total|intcomma, username=profile.username -%}
+<h2>{% trans username=profile.username %}Who {{ username }} follows{% endtrans %}{% if items_total %} <small>
+    {%- trans count=items_total, total=items_total|intcomma, username=profile.username -%}
     {{ username }} follows one member
     {%- pluralize -%}
     {{ username }} follows {{ total }} members
-    {%- endtrans %}
-    {%- else -%}
-    {% trans username=profile.username %}{{ username }} follows nobody{% endtrans %}
-    {%- endif %}</small></h2>
+    {%- endtrans -%}</small>{%- endif %}</h2>
 
 {% if items_total %}
 <div class="list-nav">
@@ -52,7 +49,7 @@
   {{ pager() }}
 </div>
 {% else %}
-<p class="lead">{% trans username=profile.username %}{{ username }} follows nobody{% endtrans %}</p>
+<p class="lead">{% trans username=profile.username %}{{ username }} follows nobody  at this time{% endtrans %}</p>
 {% endif %}
 {% endblock %}