More/better translation.

- Try to preserve some translations (somehow).
- Mark "Tagged with" again for translation.
- Do not translate the empty string

diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index 174fb3fdecd666130c9642b9e92986accf695623..be81c27b6a20c53725343cea90e40252d446c958 100644 (file)
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -81,8 +81,11 @@
       </div>
       {% block mediagoblin_footer %}
           <footer>
+            {% trans -%}
+              Powered by <a href="http://mediagoblin.org">MediaGoblin</a>, a <a href="http://gnu.org/">GNU</a> project.
+            {%- endtrans %}
             {% trans source_link=app_config['source_link'] -%}
-              Powered by <a href="http://mediagoblin.org">MediaGoblin</a>, a <a href="http://gnu.org/">GNU</a> project. Released under the <a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html">AGPL</a>. <a href="{{ source_link }}">Source code</a> available.
+              Released under the <a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html">AGPL</a>. <a href="{{ source_link }}">Source code</a> available.
             {%- endtrans %}
           </footer>
       {% endblock mediagoblin_footer %}

diff --git a/mediagoblin/templates/mediagoblin/utils/tags.html b/mediagoblin/templates/mediagoblin/utils/tags.html
index bcf3b5fdf90274c1c5dd10bcfb4a618bb7ce8c2f..eb31aba0444fa002a00c4f6f5b333baa13568fed 100644 (file)
--- a/mediagoblin/templates/mediagoblin/utils/tags.html
+++ b/mediagoblin/templates/mediagoblin/utils/tags.html
@@ -17,7 +17,7 @@
 #}
 
 {% block tags_content -%}
-  <h3 class="sidedata">Tagged with</h3>
+  <h3 class="sidedata">{% trans %}Tagged with{% endtrans %}</h3>
   <p>
     {% for tag in media.tags %}
       {% if loop.last %}

diff --git a/mediagoblin/user_pages/forms.py b/mediagoblin/user_pages/forms.py
index acfbadabe917939a3cef0db0f4261dbe414b7998..f17e6c0000622f51f83ec8da8c0c10f1dbaf2ce6 100644 (file)
--- a/mediagoblin/user_pages/forms.py
+++ b/mediagoblin/user_pages/forms.py
@@ -21,7 +21,7 @@ from mediagoblin.tools.translate import fake_ugettext_passthrough as _
 
 class MediaCommentForm(wtforms.Form):
     comment_content = wtforms.TextAreaField(
-        _(''),
+        '',
         [wtforms.validators.Required()])