Fix-bug-667-Use-lazy_pass_to_ugettext-for-forms.

diff --git a/mediagoblin/auth/forms.py b/mediagoblin/auth/forms.py
index 5484c178bf9158d5ba92309c19a628864a34d3d5..33e1f45c95cff95f2399dddb87a6e6fca086171e 100644 (file)
--- a/mediagoblin/auth/forms.py
+++ b/mediagoblin/auth/forms.py
@@ -17,7 +17,7 @@
 import wtforms
 
 from mediagoblin.tools.mail import normalize_email
-from mediagoblin.tools.translate import fake_ugettext_passthrough as _
+from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
 
 def normalize_user_or_email_field(allow_email=True, allow_user=True):
     """Check if we were passed a field that matches a username and/or email pattern

diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py
index dc408911347d21dacb90395fd39a5f5414e1cb72..627df177cc9cad6eb5c450804a0592e26c2f6a3d 100644 (file)
--- a/mediagoblin/auth/views.py
+++ b/mediagoblin/auth/views.py
@@ -20,7 +20,7 @@ import datetime
 from mediagoblin import messages, mg_globals
 from mediagoblin.db.models import User
 from mediagoblin.tools.response import render_to_response, redirect, render_404
-from mediagoblin.tools.translate import pass_to_ugettext as _
+from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
 from mediagoblin.auth import lib as auth_lib
 from mediagoblin.auth import forms as auth_forms
 from mediagoblin.auth.lib import send_verification_email, \

diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py
index 2673967bce69e18474c86b6a16d01c7c9fc9b6a7..ef2702370e62d86e0be96dc7e120e16932d2b10b 100644 (file)
--- a/mediagoblin/edit/forms.py
+++ b/mediagoblin/edit/forms.py
@@ -17,7 +17,7 @@
 import wtforms
 
 from mediagoblin.tools.text import tag_length_validator, TOO_LONG_TAG_WARNING
-from mediagoblin.tools.translate import fake_ugettext_passthrough as _
+from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
 from mediagoblin.tools.licenses import licenses_as_choices
 
 class EditForm(wtforms.Form):

diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index 34b7aaca4004e5b199e8f2e459f8c7fca766b6e4..b0d8dd5d0111de135bc370b51c97301f2aad08ad 100644 (file)
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -29,7 +29,7 @@ from mediagoblin.decorators import (require_active_login, active_user_from_url,
      get_media_entry_by_id,
      user_may_alter_collection, get_user_collection)
 from mediagoblin.tools.response import render_to_response, redirect
-from mediagoblin.tools.translate import pass_to_ugettext as _
+from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
 from mediagoblin.tools.text import (
     convert_to_tag_list_of_dicts, media_tags_as_string)
 from mediagoblin.tools.url import slugify

diff --git a/mediagoblin/gmg_commands/theme.py b/mediagoblin/gmg_commands/theme.py
index 71abb982f2e56952bf120ecb373cb567baca4cdb..95b9425cec6e7af0a6facf49100e1c5aec12536a 100644 (file)
--- a/mediagoblin/gmg_commands/theme.py
+++ b/mediagoblin/gmg_commands/theme.py
@@ -18,7 +18,7 @@ import os
 
 from mediagoblin.init import setup_global_and_app_config
 from mediagoblin.tools.theme import register_themes
-from mediagoblin.tools.translate import pass_to_ugettext as _
+from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
 from mediagoblin.tools.common import simple_printer
 
 

diff --git a/mediagoblin/plugins/oauth/forms.py b/mediagoblin/plugins/oauth/forms.py
index d0a4e9b8ab45359f5c848828fa3b185bfb8b8579..5edd992a509a991676d0fd569b70248ce9806472 100644 (file)
--- a/mediagoblin/plugins/oauth/forms.py
+++ b/mediagoblin/plugins/oauth/forms.py
@@ -19,7 +19,7 @@ import wtforms
 from urlparse import urlparse
 
 from mediagoblin.tools.extlib.wtf_html5 import URLField
-from mediagoblin.tools.translate import fake_ugettext_passthrough as _
+from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
 
 
 class AuthorizationForm(wtforms.Form):

diff --git a/mediagoblin/submit/forms.py b/mediagoblin/submit/forms.py
index bd1e904f8b3cafb0aa5d2ec7bba6ea32e3ac56dd..e9bd93fde6427de0c6f4d3dc37fbf3b9717adda5 100644 (file)
--- a/mediagoblin/submit/forms.py
+++ b/mediagoblin/submit/forms.py
@@ -18,7 +18,7 @@
 import wtforms
 
 from mediagoblin.tools.text import tag_length_validator
-from mediagoblin.tools.translate import fake_ugettext_passthrough as _
+from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
 from mediagoblin.tools.licenses import licenses_as_choices
 
 

diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py
index 9d31c8449545763967cf93296843344d9d8a6b9a..1a7c0ceddef07006ba74941dba50dec806c5d251 100644 (file)
--- a/mediagoblin/submit/views.py
+++ b/mediagoblin/submit/views.py
@@ -24,7 +24,7 @@ _log = logging.getLogger(__name__)
 
 
 from mediagoblin.tools.text import convert_to_tag_list_of_dicts
-from mediagoblin.tools.translate import pass_to_ugettext as _
+from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
 from mediagoblin.tools.response import render_to_response, redirect
 from mediagoblin.decorators import require_active_login
 from mediagoblin.submit import forms as submit_forms

diff --git a/mediagoblin/templates/mediagoblin/utils/wtforms.html b/mediagoblin/templates/mediagoblin/utils/wtforms.html
index 35b4aa0499bcac10ed87f1d30727fb797fd1b7ef..be6976c2b324f8de7ca9bf9b94452005d228d5aa 100644 (file)
--- a/mediagoblin/templates/mediagoblin/utils/wtforms.html
+++ b/mediagoblin/templates/mediagoblin/utils/wtforms.html
@@ -19,7 +19,7 @@
 {# Render the label for a field #}
 {% macro render_label(field) %}
   {%- if field.label.text -%}
-    <label for="{{ field.label.field_id }}">{{ _(field.label.text) }}</label>
+    <label for="{{ field.label.field_id }}">{{ field.label.text }}</label>
   {%- endif -%}
 {%- endmacro %}
 
@@ -39,11 +39,11 @@
     {{ field }}
     {%- if field.errors -%}
       {% for error in field.errors %}
-        <p class="form_field_error">{{ _(error) }}</p>
+        <p class="form_field_error">{{ error }}</p>
       {% endfor %}
     {%- endif %}
     {%- if field.description %}
-      <p class="form_field_description">{{ _(field.description)|safe }}</p>
+      <p class="form_field_description">{{ field.description|safe }}</p>
     {%- endif %}
   </div>
 {%- endmacro %}
@@ -59,7 +59,7 @@
 {% macro render_table(form) -%}
   {% for field in form %}
     <tr>
-      <th>{{ _(field.label.text) }}</th>
+      <th>{{ field.label.text }}</th>
       <td>
         {{field}}
         {% if field.errors %}

diff --git a/mediagoblin/tools/exif.py b/mediagoblin/tools/exif.py
index d0f9d0a6917c871b24b15c2e846f31a60ffd4398..ced9ee8e24433e7f28e54d997b05ffd1b42f0140 100644 (file)
--- a/mediagoblin/tools/exif.py
+++ b/mediagoblin/tools/exif.py
@@ -20,7 +20,7 @@ except ImportError:
     from mediagoblin.tools.extlib.EXIF import process_file, Ratio
 
 from mediagoblin.processing import BadMediaFail
-from mediagoblin.tools.translate import pass_to_ugettext as _
+from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
 
 # A list of tags that should be stored for faster access
 USEFUL_TAGS = [

diff --git a/mediagoblin/user_pages/forms.py b/mediagoblin/user_pages/forms.py
index e9746a6caa1aa88e7f466edb28c49f0fdae0bd89..9a1936805500f6cfda70204575e68651160f0046 100644 (file)
--- a/mediagoblin/user_pages/forms.py
+++ b/mediagoblin/user_pages/forms.py
@@ -16,7 +16,7 @@
 
 import wtforms
 from wtforms.ext.sqlalchemy.fields import QuerySelectField
-from mediagoblin.tools.translate import fake_ugettext_passthrough as _
+from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
 
 class MediaCommentForm(wtforms.Form):
     comment_content = wtforms.TextAreaField(

diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index e3b46c0f8787b41a0868d38f6d113727265d8456..f526656f51d68eea26b2eebc9381ed0f4d533ca3 100644 (file)
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -21,7 +21,7 @@ from mediagoblin import messages, mg_globals
 from mediagoblin.db.models import (MediaEntry, MediaTag, Collection,
                                    CollectionItem, User)
 from mediagoblin.tools.response import render_to_response, render_404, redirect
-from mediagoblin.tools.translate import pass_to_ugettext as _
+from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
 from mediagoblin.tools.pagination import Pagination
 from mediagoblin.user_pages import forms as user_forms
 from mediagoblin.user_pages.lib import (send_comment_email,