From 416b439fc883a570902edd094b44f310d66e849c Mon Sep 17 00:00:00 2001
From: Elrond <elrond+mediagoblin.org@samba-tng.org>
Date: Sat, 17 Mar 2012 13:18:43 +0100
Subject: [PATCH] More/better translation.

- Try to preserve some translations (somehow).
- Mark "Tagged with" again for translation.
- Do not translate the empty string
---
 mediagoblin/templates/mediagoblin/base.html       | 5 ++++-
 mediagoblin/templates/mediagoblin/utils/tags.html | 2 +-
 mediagoblin/user_pages/forms.py                   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index 174fb3fd..be81c27b 100644
--- 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 bcf3b5fd..eb31aba0 100644
--- 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 acfbadab..f17e6c00 100644
--- 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()])
 
 
-- 
2.25.1