minor i18n fix: cannot gettext-wrap unicode literals, e.g. _(u'foo')

Not sure if this is Babel, gettext, or something else. Anyway, it's fixed.

git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@167 6d9bc8c9-1ec2-4278-b937-99fde70a366f

diff --git a/conifer/locale/django.pot b/conifer/locale/django.pot
index 5290a92..d7c4193 100644 (file)
--- a/conifer/locale/django.pot
+++ b/conifer/locale/django.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2009-03-10 22:25-0400\n"
+"POT-Creation-Date: 2009-03-12 18:41-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -312,6 +312,11 @@ msgstr ""
 msgid "Remove?"
 msgstr ""
 
+#: templates/edit_course_permissions.xhtml:26
+#: templates/edit_course_permissions.xhtml:39
+msgid "Proxy instructor"
+msgstr ""
+
 #: templates/edit_course_permissions.xhtml:36
 msgid "Username of the new instructor."
 msgstr ""
@@ -324,10 +329,6 @@ msgstr ""
 msgid "PROXY"
 msgstr ""
 
-#: templates/edit_course_permissions.xhtml:39
-msgid "Proxy instructor"
-msgstr ""
-
 #: templates/edit_course_permissions.xhtml:46
 msgid "Save changes to instructors"
 msgstr ""

diff --git a/conifer/locale/en_US/LC_MESSAGES/django.po b/conifer/locale/en_US/LC_MESSAGES/django.po
index c6ab900..76b7c9c 100644 (file)
--- a/conifer/locale/en_US/LC_MESSAGES/django.po
+++ b/conifer/locale/en_US/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2009-03-10 22:24+0400\n"
-"PO-Revision-Date: 2009-03-10 22:25-0400\n"
+"PO-Revision-Date: 2009-03-12 18:41-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en_US <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -313,6 +313,11 @@ msgstr ""
 msgid "Remove?"
 msgstr ""
 
+#: templates/edit_course_permissions.xhtml:26
+#: templates/edit_course_permissions.xhtml:39
+msgid "Proxy instructor"
+msgstr ""
+
 #: templates/edit_course_permissions.xhtml:36
 msgid "Username of the new instructor."
 msgstr ""
@@ -325,10 +330,6 @@ msgstr ""
 msgid "PROXY"
 msgstr ""
 
-#: templates/edit_course_permissions.xhtml:39
-msgid "Proxy instructor"
-msgstr ""
-
 #: templates/edit_course_permissions.xhtml:46
 msgid "Save changes to instructors"
 msgstr ""

diff --git a/conifer/locale/fr_CA/LC_MESSAGES/django.po b/conifer/locale/fr_CA/LC_MESSAGES/django.po
index 81e6833..84a5060 100644 (file)
--- a/conifer/locale/fr_CA/LC_MESSAGES/django.po
+++ b/conifer/locale/fr_CA/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2009-03-10 22:24+0400\n"
-"PO-Revision-Date: 2009-03-10 22:25-0400\n"
+"PO-Revision-Date: 2009-03-12 18:41-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: fr_CA <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
@@ -312,6 +312,11 @@ msgstr ""
 msgid "Remove?"
 msgstr ""
 
+#: templates/edit_course_permissions.xhtml:26
+#: templates/edit_course_permissions.xhtml:39
+msgid "Proxy instructor"
+msgstr ""
+
 #: templates/edit_course_permissions.xhtml:36
 msgid "Username of the new instructor."
 msgstr ""
@@ -324,10 +329,6 @@ msgstr ""
 msgid "PROXY"
 msgstr ""
 
-#: templates/edit_course_permissions.xhtml:39
-msgid "Proxy instructor"
-msgstr ""
-
 #: templates/edit_course_permissions.xhtml:46
 msgid "Save changes to instructors"
 msgstr ""
@@ -629,7 +630,7 @@ msgstr ""
 
 #: templates/tabbar.xhtml:10 templates/tabbar_anonymous.xhtml:10
 msgid "Home"
-msgstr "Acceuil"
+msgstr ""
 
 #: templates/tabbar.xhtml:11 templates/tabbar_anonymous.xhtml:11
 msgid "Browse"
@@ -645,8 +646,7 @@ msgid ""
 "and visit your course sites."
 msgstr ""
 "Bienvenue! Utilisez s.v.p. the links above to browse the reserves, or to "
-"join \"\n"
-"\"and visit your course sites."
+"join and visit your course sites."
 
 #: templates/welcome.xhtml:17
 msgid "posted"

diff --git a/conifer/templates/edit_course_permissions.xhtml b/conifer/templates/edit_course_permissions.xhtml
index f06f6e6..dee75ed 100644 (file)
--- a/conifer/templates/edit_course_permissions.xhtml
+++ b/conifer/templates/edit_course_permissions.xhtml
@@ -25,7 +25,7 @@ instructors = [m for m in models.Member.objects.filter(course=course) if m.role
       <tbody>
        <select py:def="select_role(mbr)" 
                py:replace="Markup(django.forms.Select(choices=
-                           [(u'INSTR',_(u'Instructor')), (u'PROXY', _(u'Proxy instructor'))])
+                           [(u'INSTR',_('Instructor')), (u'PROXY', _('Proxy instructor'))])
                            .render('instructor_role_%d' % mbr.id, mbr.role))"/>
       <tr py:for="mbr in instructors">
        <td>${mbr.user.get_full_name() or ''} <code>(${mbr.user.username})</code></td>