[open-ils-commits] r135 - in servres/trunk/conifer: . locale locale/en_US/LC_MESSAGES locale/fr_CA/LC_MESSAGES syrup templates templates/admin templates/auth templates/components templates/generic (gfawcett)
svn at svn.open-ils.org
svn at svn.open-ils.org
Tue Mar 3 20:33:54 EST 2009
Author: gfawcett
Date: 2009-03-03 20:33:53 -0500 (Tue, 03 Mar 2009)
New Revision: 135
Modified:
servres/trunk/conifer/babel.cfg
servres/trunk/conifer/locale/conifer-syrup.pot
servres/trunk/conifer/locale/en_US/LC_MESSAGES/conifer-syrup.po
servres/trunk/conifer/locale/fr_CA/LC_MESSAGES/conifer-syrup.po
servres/trunk/conifer/syrup/models.py
servres/trunk/conifer/syrup/views.py
servres/trunk/conifer/templates/admin/index.xhtml
servres/trunk/conifer/templates/admin/term.xhtml
servres/trunk/conifer/templates/auth/login.xhtml
servres/trunk/conifer/templates/browse_courses.xhtml
servres/trunk/conifer/templates/components/course.xhtml
servres/trunk/conifer/templates/generic/delete.xhtml
servres/trunk/conifer/templates/generic/edit.xhtml
servres/trunk/conifer/templates/instructors.xhtml
servres/trunk/conifer/templates/item_add_elec.xhtml
servres/trunk/conifer/templates/item_add_heading.xhtml
servres/trunk/conifer/templates/item_add_url.xhtml
servres/trunk/conifer/templates/master.xhtml
servres/trunk/conifer/templates/my_courses.xhtml
servres/trunk/conifer/templates/open_courses.xhtml
servres/trunk/conifer/templates/search_results.xhtml
servres/trunk/conifer/templates/tabbar.xhtml
servres/trunk/conifer/templates/tabbar_anonymous.xhtml
servres/trunk/conifer/templates/welcome.xhtml
Log:
i18n review -- tagged all the English literals, rebuilt POT
There are a couple oddballs that I'm not sure how to handle. For
exmaple, how does one internationalize an HTML literal like "This is a
subproject of <a href="...">Project Conifer</a>."? I don't see
anything in Babel that has the right kind of smarts for this. Must ask
an i18n guru.
Modified: servres/trunk/conifer/babel.cfg
===================================================================
--- servres/trunk/conifer/babel.cfg 2009-03-04 01:33:21 UTC (rev 134)
+++ servres/trunk/conifer/babel.cfg 2009-03-04 01:33:53 UTC (rev 135)
@@ -3,5 +3,5 @@
[python: **.py]
[genshi: **.xhtml]
-ignore_tags= script, style
-include_attrs = alt title summary
+ignore_tags= script style
+include_attrs = alt title summary value
Modified: servres/trunk/conifer/locale/conifer-syrup.pot
===================================================================
--- servres/trunk/conifer/locale/conifer-syrup.pot 2009-03-04 01:33:21 UTC (rev 134)
+++ servres/trunk/conifer/locale/conifer-syrup.pot 2009-03-04 01:33:53 UTC (rev 135)
@@ -1,14 +1,14 @@
# Translations template for PROJECT.
-# Copyright (C) 2008 ORGANIZATION
+# Copyright (C) 2009 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL at ADDRESS>, 2008.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2008-11-18 21:24-0500\n"
+"POT-Creation-Date: 2009-03-03 20:23-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,31 +17,322 @@
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 0.9.4\n"
-#: templates/master.xhtml:26
+#: syrup/models.py:62
+msgid "custodian"
+msgstr ""
+
+#: syrup/models.py:63
+msgid "staff"
+msgstr ""
+
+#: syrup/models.py:64
+msgid "system administrator"
+msgstr ""
+
+#: syrup/models.py:156
+msgid "This is a moderated (non-public) course"
+msgstr ""
+
+#: syrup/models.py:218
+msgid "Instructor"
+msgstr ""
+
+#: syrup/models.py:219
+msgid "Proxy Instructor"
+msgstr ""
+
+#: syrup/models.py:220
+msgid "Student"
+msgstr ""
+
+#: syrup/models.py:255
+msgid "Attached Electronic Document"
+msgstr ""
+
+#: syrup/models.py:256
+msgid "Physical Book or Document"
+msgstr ""
+
+#: syrup/models.py:257 templates/item_add_url.xhtml:24
+#: templates/item_metadata.xhtml:22 templates/components/course.xhtml:57
+msgid "URL"
+msgstr ""
+
+#: syrup/models.py:258 templates/item_add_heading.xhtml:23
+msgid "Heading"
+msgstr ""
+
+#: syrup/models.py:312
+msgid "In Process"
+msgstr ""
+
+#: syrup/models.py:313
+msgid "Active"
+msgstr ""
+
+#: syrup/models.py:314
+msgid "InActive"
+msgstr ""
+
+#: syrup/models.py:396
+msgid "(Markdown not installed)."
+msgstr ""
+
+#: syrup/models.py:403
+msgid "plain text"
+msgstr ""
+
+#: syrup/models.py:404
+msgid "HTML"
+msgstr ""
+
+#: syrup/models.py:405
+msgid "Markdown"
+msgstr ""
+
+#: syrup/views.py:38
+msgid "Invalid username or password. Please try again."
+msgstr ""
+
+#: syrup/views.py:40
+msgid "Sorry, this account has been disabled."
+msgstr ""
+
+#: syrup/views.py:82
+msgid "Sorry..."
+msgstr ""
+
+#: syrup/views.py:83
+msgid "The Preferences page isn't ready yet."
+msgstr ""
+
+#: syrup/views.py:198
+msgid "not an editor"
+msgstr ""
+
+#: syrup/views.py:201
+msgid "No item_type parameter was provided."
+msgstr ""
+
+#: syrup/views.py:205
+msgid "Sorry, only HEADINGs, URLs and ELECs can be added right now."
+msgstr ""
+
+#: syrup/views.py:296
+msgid "Can only download ELEC documents!"
+msgstr ""
+
+#: syrup/views.py:434 templates/admin/index.xhtml:15
+msgid "Terms"
+msgstr ""
+
+#: syrup/views.py:446
+msgid "start must precede finish"
+msgstr ""
+
+#: syrup/views.py:456 templates/admin/index.xhtml:14
+msgid "Departments"
+msgstr ""
+
+#: syrup/views.py:472 templates/admin/index.xhtml:16
+msgid "News Items"
+msgstr ""
+
+#: templates/browse_courses.xhtml:1 templates/my_courses.xhtml:1
+msgid "Welcome to Syrup E-Reserves!"
+msgstr ""
+
+#: templates/browse_courses.xhtml:12 templates/tabbar.xhtml:11
+#: templates/tabbar_anonymous.xhtml:11
+msgid "Browse"
+msgstr ""
+
+#: templates/browse_courses.xhtml:12
+msgid ""
+"(Note: some course materials may require you\n"
+" to"
+msgstr ""
+
+#: templates/browse_courses.xhtml:13
+msgid "log in"
+msgstr ""
+
+#: templates/browse_courses.xhtml:14
+msgid "Choose from one of the options below:"
+msgstr ""
+
+#: templates/browse_courses.xhtml:16
+msgid "Browse by Instructor"
+msgstr ""
+
+#: templates/browse_courses.xhtml:17
+msgid "Browse by Department"
+msgstr ""
+
+#: templates/browse_courses.xhtml:18
+msgid "Browse by Course Name"
+msgstr ""
+
+#: templates/course_detail.xhtml:17
+msgid "There are no items associated with this course yet."
+msgstr ""
+
+#: templates/instructors.xhtml:1
+msgid "Instructors"
+msgstr ""
+
+#: templates/instructors.xhtml:12 templates/open_courses.xhtml:12
+#: templates/search_results.xhtml:14
+msgid "$(function() { $('.pagetable').tablesorter(); });"
+msgstr ""
+
+#: templates/instructors.xhtml:19
+msgid "Name"
+msgstr ""
+
+#: templates/item_add_elec.xhtml:1
+msgid "Edit an electronic document"
+msgstr ""
+
+#: templates/item_add_elec.xhtml:1
+msgid "Add a new electronic document"
+msgstr ""
+
+#: templates/item_add_elec.xhtml:13 templates/item_add_heading.xhtml:13
+#: templates/item_add_url.xhtml:13
+msgid "$(function() {$('input[@name=\"title\"]').focus();});"
+msgstr ""
+
+#: templates/item_add_elec.xhtml:25 templates/item_add_elec.xhtml:37
+msgid "Title of document"
+msgstr ""
+
+#: templates/item_add_elec.xhtml:28 templates/item_add_elec.xhtml:45
+msgid "File"
+msgstr ""
+
+#: templates/item_add_elec.xhtml:30
+msgid "Upload file and Create item"
+msgstr ""
+
+#: templates/item_add_elec.xhtml:40
+msgid "Update item"
+msgstr ""
+
+#: templates/item_add_elec.xhtml:42
+msgid "Replace the current file with a new file"
+msgstr ""
+
+#: templates/item_add_elec.xhtml:47
+msgid "Upload new file"
+msgstr ""
+
+#: templates/item_add_heading.xhtml:1
+msgid "Edit a subheading"
+msgstr ""
+
+#: templates/item_add_heading.xhtml:1
+msgid "Add a new subheading"
+msgstr ""
+
+#: templates/item_add_heading.xhtml:29
+msgid "Add heading"
+msgstr ""
+
+#: templates/item_add_heading.xhtml:30
+msgid "Update heading"
+msgstr ""
+
+#: templates/item_add_url.xhtml:1
+msgid "Edit a URL"
+msgstr ""
+
+#: templates/item_add_url.xhtml:1
+msgid "Add a new URL"
+msgstr ""
+
+#: templates/item_add_url.xhtml:23 templates/item_metadata.xhtml:19
+#: templates/open_courses.xhtml:19 templates/search_results.xhtml:70
+msgid "Title"
+msgstr ""
+
+#: templates/item_add_url.xhtml:27
+msgid "Add URL"
+msgstr ""
+
+#: templates/item_add_url.xhtml:28
+msgid "Update URL"
+msgstr ""
+
+#: templates/item_heading_detail.xhtml:20
+msgid "There are no items in this section."
+msgstr ""
+
+#: templates/item_metadata.xhtml:20
+msgid "Type"
+msgstr ""
+
+#: templates/item_metadata.xhtml:21 templates/search_results.xhtml:70
+msgid "Author"
+msgstr ""
+
+#: templates/item_metadata.xhtml:25
+msgid "Download"
+msgstr ""
+
+#: templates/item_metadata.xhtml:27
+msgid "Content type"
+msgstr ""
+
+#: templates/item_metadata.xhtml:28
+msgid "Content length"
+msgstr ""
+
+#: templates/master.xhtml:1
+msgid "Syrup E-Reserve System"
+msgstr ""
+
+#: templates/master.xhtml:1
+msgid "search..."
+msgstr ""
+
+#: templates/master.xhtml:43
msgid "Welcome,"
msgstr ""
-#: templates/master.xhtml:27
+#: templates/master.xhtml:44
msgid "Log Out"
msgstr ""
-#: templates/master.xhtml:28 templates/tabbar.xhtml:10
+#: templates/master.xhtml:45
msgid "Preferences"
msgstr ""
-#: templates/master.xhtml:29
+#: templates/master.xhtml:46
msgid "Admin UI"
msgstr ""
-#: templates/master.xhtml:32
+#: templates/master.xhtml:49 templates/welcome.xhtml:1
msgid "Welcome!"
msgstr ""
-#: templates/master.xhtml:39
+#: templates/master.xhtml:50
+msgid "Log In"
+msgstr ""
+
+#: templates/master.xhtml:67
+msgid "Start Over"
+msgstr ""
+
+#: templates/master.xhtml:68
+msgid "Syrup is a subproject of"
+msgstr ""
+
+#: templates/master.xhtml:69
msgid "Project Conifer"
msgstr ""
-#: templates/my_courses.xhtml:12 templates/tabbar.xhtml:7
+#: templates/my_courses.xhtml:12 templates/tabbar.xhtml:12
msgid "My Courses"
msgstr ""
@@ -49,30 +340,82 @@
msgid "You are not part of any courses at this time."
msgstr ""
-#: templates/tabbar.xhtml:6
-msgid "Home"
+#: templates/open_courses.xhtml:1
+msgid "Open Courses"
msgstr ""
-#: templates/tabbar.xhtml:8
-msgid "Add a Reserve"
+#: templates/open_courses.xhtml:19
+msgid "Term"
msgstr ""
-#: templates/tabbar.xhtml:9
-msgid "Manage Users"
+#: templates/open_courses.xhtml:19
+msgid "Code"
msgstr ""
-#: templates/welcome.xhtml:13
-msgid "Log in"
+#: templates/paginate.xhtml:21
+msgid "Previous"
msgstr ""
-#: templates/welcome.xhtml:14
-msgid "Search the Reserves"
+#: templates/paginate.xhtml:30
+msgid "Next"
msgstr ""
-#: templates/welcome.xhtml:16
+#: templates/search_results.xhtml:1
+msgid "Search Results"
+msgstr ""
+
+#: templates/search_results.xhtml:21
+msgid "You searched:"
+msgstr ""
+
+#: templates/search_results.xhtml:35
+msgid "Last Name"
+msgstr ""
+
+#: templates/search_results.xhtml:35
+msgid "First Name"
+msgstr ""
+
+#: templates/search_results.xhtml:44 templates/search_results.xhtml:62
+msgid "more...)"
+msgstr ""
+
+#: templates/search_results.xhtml:53
+msgid "Course"
+msgstr ""
+
+#: templates/tabbar.xhtml:10 templates/tabbar_anonymous.xhtml:10
+msgid "Home"
+msgstr ""
+
+#: templates/tabbar.xhtml:13
+msgid "Admin Options"
+msgstr ""
+
+#: templates/welcome.xhtml:12
msgid "News"
msgstr ""
+#: templates/welcome.xhtml:16
+msgid "posted"
+msgstr ""
+
+#: templates/admin/index.xhtml:1
+msgid "Administrative Options"
+msgstr ""
+
+#: templates/admin/term.xhtml:1
+msgid "Add a new Term"
+msgstr ""
+
+#: templates/admin/term.xhtml:15
+msgid "Save"
+msgstr ""
+
+#: templates/auth/login.xhtml:1
+msgid "Syrup E-Reserves: Please log in"
+msgstr ""
+
#: templates/auth/login.xhtml:10
msgid "$(function() {$('#userid').focus();});"
msgstr ""
@@ -81,11 +424,90 @@
msgid "Please log in."
msgstr ""
-#: templates/auth/login.xhtml:20
+#: templates/auth/login.xhtml:21
msgid "User ID:"
msgstr ""
-#: templates/auth/login.xhtml:24
+#: templates/auth/login.xhtml:25
msgid "Password:"
msgstr ""
+#: templates/auth/login.xhtml:29
+msgid "Log in"
+msgstr ""
+
+#: templates/components/course.xhtml:1
+msgid "search this course..."
+msgstr ""
+
+#: templates/components/course.xhtml:34
+msgid "about"
+msgstr ""
+
+#: templates/components/course.xhtml:35
+msgid "edit"
+msgstr ""
+
+#: templates/components/course.xhtml:47
+msgid "Top"
+msgstr ""
+
+#: templates/components/course.xhtml:54
+msgid "Add a new item:"
+msgstr ""
+
+#: templates/components/course.xhtml:56
+msgid "Subheading"
+msgstr ""
+
+#: templates/components/course.xhtml:58
+msgid "Electronic Document"
+msgstr ""
+
+#: templates/components/course.xhtml:59
+msgid "Physical Book/Document"
+msgstr ""
+
+#: templates/generic/delete.xhtml:1
+#, python-format
+msgid "Delete %s?"
+msgstr ""
+
+#: templates/generic/delete.xhtml:20
+msgid "Delete"
+msgstr ""
+
+#: templates/generic/delete.xhtml:21
+msgid "Cancel"
+msgstr ""
+
+#: templates/generic/edit.xhtml:1
+#, python-format
+msgid "Modify %s"
+msgstr ""
+
+#: templates/generic/edit.xhtml:1
+#, python-format
+msgid "Add %s"
+msgstr ""
+
+#: templates/generic/edit.xhtml:18
+msgid "Save changes"
+msgstr ""
+
+#: templates/generic/edit.xhtml:19
+msgid "Cancel changes"
+msgstr ""
+
+#: templates/generic/edit.xhtml:20
+msgid "Delete this record"
+msgstr ""
+
+#: templates/generic/index.xhtml:11
+msgid "$(function() { $('table').tablesorter(); });"
+msgstr ""
+
+#: templates/generic/index.xhtml:29
+msgid "Add"
+msgstr ""
+
Modified: servres/trunk/conifer/locale/en_US/LC_MESSAGES/conifer-syrup.po
===================================================================
--- servres/trunk/conifer/locale/en_US/LC_MESSAGES/conifer-syrup.po 2009-03-04 01:33:21 UTC (rev 134)
+++ servres/trunk/conifer/locale/en_US/LC_MESSAGES/conifer-syrup.po 2009-03-04 01:33:53 UTC (rev 135)
@@ -8,7 +8,7 @@
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
"POT-Creation-Date: 2008-11-15 20:37+0500\n"
-"PO-Revision-Date: 2008-11-18 21:24-0500\n"
+"PO-Revision-Date: 2009-03-03 20:23-0500\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: en_US <LL at li.org>\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -17,31 +17,322 @@
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 0.9.4\n"
-#: templates/master.xhtml:26
+#: syrup/models.py:62
+msgid "custodian"
+msgstr ""
+
+#: syrup/models.py:63
+msgid "staff"
+msgstr ""
+
+#: syrup/models.py:64
+msgid "system administrator"
+msgstr ""
+
+#: syrup/models.py:156
+msgid "This is a moderated (non-public) course"
+msgstr ""
+
+#: syrup/models.py:218
+msgid "Instructor"
+msgstr ""
+
+#: syrup/models.py:219
+msgid "Proxy Instructor"
+msgstr ""
+
+#: syrup/models.py:220
+msgid "Student"
+msgstr ""
+
+#: syrup/models.py:255
+msgid "Attached Electronic Document"
+msgstr ""
+
+#: syrup/models.py:256
+msgid "Physical Book or Document"
+msgstr ""
+
+#: syrup/models.py:257 templates/item_add_url.xhtml:24
+#: templates/item_metadata.xhtml:22 templates/components/course.xhtml:57
+msgid "URL"
+msgstr ""
+
+#: syrup/models.py:258 templates/item_add_heading.xhtml:23
+msgid "Heading"
+msgstr ""
+
+#: syrup/models.py:312
+msgid "In Process"
+msgstr ""
+
+#: syrup/models.py:313
+msgid "Active"
+msgstr ""
+
+#: syrup/models.py:314
+msgid "InActive"
+msgstr ""
+
+#: syrup/models.py:396
+msgid "(Markdown not installed)."
+msgstr ""
+
+#: syrup/models.py:403
+msgid "plain text"
+msgstr ""
+
+#: syrup/models.py:404
+msgid "HTML"
+msgstr ""
+
+#: syrup/models.py:405
+msgid "Markdown"
+msgstr ""
+
+#: syrup/views.py:38
+msgid "Invalid username or password. Please try again."
+msgstr ""
+
+#: syrup/views.py:40
+msgid "Sorry, this account has been disabled."
+msgstr ""
+
+#: syrup/views.py:82
+msgid "Sorry..."
+msgstr ""
+
+#: syrup/views.py:83
+msgid "The Preferences page isn't ready yet."
+msgstr ""
+
+#: syrup/views.py:198
+msgid "not an editor"
+msgstr ""
+
+#: syrup/views.py:201
+msgid "No item_type parameter was provided."
+msgstr ""
+
+#: syrup/views.py:205
+msgid "Sorry, only HEADINGs, URLs and ELECs can be added right now."
+msgstr ""
+
+#: syrup/views.py:296
+msgid "Can only download ELEC documents!"
+msgstr ""
+
+#: syrup/views.py:434 templates/admin/index.xhtml:15
+msgid "Terms"
+msgstr ""
+
+#: syrup/views.py:446
+msgid "start must precede finish"
+msgstr ""
+
+#: syrup/views.py:456 templates/admin/index.xhtml:14
+msgid "Departments"
+msgstr ""
+
+#: syrup/views.py:472 templates/admin/index.xhtml:16
+msgid "News Items"
+msgstr ""
+
+#: templates/browse_courses.xhtml:1 templates/my_courses.xhtml:1
+msgid "Welcome to Syrup E-Reserves!"
+msgstr ""
+
+#: templates/browse_courses.xhtml:12 templates/tabbar.xhtml:11
+#: templates/tabbar_anonymous.xhtml:11
+msgid "Browse"
+msgstr ""
+
+#: templates/browse_courses.xhtml:12
+msgid ""
+"(Note: some course materials may require you\n"
+" to"
+msgstr ""
+
+#: templates/browse_courses.xhtml:13
+msgid "log in"
+msgstr ""
+
+#: templates/browse_courses.xhtml:14
+msgid "Choose from one of the options below:"
+msgstr ""
+
+#: templates/browse_courses.xhtml:16
+msgid "Browse by Instructor"
+msgstr ""
+
+#: templates/browse_courses.xhtml:17
+msgid "Browse by Department"
+msgstr ""
+
+#: templates/browse_courses.xhtml:18
+msgid "Browse by Course Name"
+msgstr ""
+
+#: templates/course_detail.xhtml:17
+msgid "There are no items associated with this course yet."
+msgstr ""
+
+#: templates/instructors.xhtml:1
+msgid "Instructors"
+msgstr ""
+
+#: templates/instructors.xhtml:12 templates/open_courses.xhtml:12
+#: templates/search_results.xhtml:14
+msgid "$(function() { $('.pagetable').tablesorter(); });"
+msgstr ""
+
+#: templates/instructors.xhtml:19
+msgid "Name"
+msgstr ""
+
+#: templates/item_add_elec.xhtml:1
+msgid "Edit an electronic document"
+msgstr ""
+
+#: templates/item_add_elec.xhtml:1
+msgid "Add a new electronic document"
+msgstr ""
+
+#: templates/item_add_elec.xhtml:13 templates/item_add_heading.xhtml:13
+#: templates/item_add_url.xhtml:13
+msgid "$(function() {$('input[@name=\"title\"]').focus();});"
+msgstr ""
+
+#: templates/item_add_elec.xhtml:25 templates/item_add_elec.xhtml:37
+msgid "Title of document"
+msgstr ""
+
+#: templates/item_add_elec.xhtml:28 templates/item_add_elec.xhtml:45
+msgid "File"
+msgstr ""
+
+#: templates/item_add_elec.xhtml:30
+msgid "Upload file and Create item"
+msgstr ""
+
+#: templates/item_add_elec.xhtml:40
+msgid "Update item"
+msgstr ""
+
+#: templates/item_add_elec.xhtml:42
+msgid "Replace the current file with a new file"
+msgstr ""
+
+#: templates/item_add_elec.xhtml:47
+msgid "Upload new file"
+msgstr ""
+
+#: templates/item_add_heading.xhtml:1
+msgid "Edit a subheading"
+msgstr ""
+
+#: templates/item_add_heading.xhtml:1
+msgid "Add a new subheading"
+msgstr ""
+
+#: templates/item_add_heading.xhtml:29
+msgid "Add heading"
+msgstr ""
+
+#: templates/item_add_heading.xhtml:30
+msgid "Update heading"
+msgstr ""
+
+#: templates/item_add_url.xhtml:1
+msgid "Edit a URL"
+msgstr ""
+
+#: templates/item_add_url.xhtml:1
+msgid "Add a new URL"
+msgstr ""
+
+#: templates/item_add_url.xhtml:23 templates/item_metadata.xhtml:19
+#: templates/open_courses.xhtml:19 templates/search_results.xhtml:70
+msgid "Title"
+msgstr ""
+
+#: templates/item_add_url.xhtml:27
+msgid "Add URL"
+msgstr ""
+
+#: templates/item_add_url.xhtml:28
+msgid "Update URL"
+msgstr ""
+
+#: templates/item_heading_detail.xhtml:20
+msgid "There are no items in this section."
+msgstr ""
+
+#: templates/item_metadata.xhtml:20
+msgid "Type"
+msgstr ""
+
+#: templates/item_metadata.xhtml:21 templates/search_results.xhtml:70
+msgid "Author"
+msgstr ""
+
+#: templates/item_metadata.xhtml:25
+msgid "Download"
+msgstr ""
+
+#: templates/item_metadata.xhtml:27
+msgid "Content type"
+msgstr ""
+
+#: templates/item_metadata.xhtml:28
+msgid "Content length"
+msgstr ""
+
+#: templates/master.xhtml:1
+msgid "Syrup E-Reserve System"
+msgstr ""
+
+#: templates/master.xhtml:1
+msgid "search..."
+msgstr ""
+
+#: templates/master.xhtml:43
msgid "Welcome,"
msgstr ""
-#: templates/master.xhtml:27
+#: templates/master.xhtml:44
msgid "Log Out"
msgstr ""
-#: templates/master.xhtml:28 templates/tabbar.xhtml:10
+#: templates/master.xhtml:45
msgid "Preferences"
msgstr ""
-#: templates/master.xhtml:29
+#: templates/master.xhtml:46
msgid "Admin UI"
msgstr ""
-#: templates/master.xhtml:32
+#: templates/master.xhtml:49 templates/welcome.xhtml:1
msgid "Welcome!"
msgstr ""
-#: templates/master.xhtml:39
+#: templates/master.xhtml:50
+msgid "Log In"
+msgstr ""
+
+#: templates/master.xhtml:67
+msgid "Start Over"
+msgstr ""
+
+#: templates/master.xhtml:68
+msgid "Syrup is a subproject of"
+msgstr ""
+
+#: templates/master.xhtml:69
msgid "Project Conifer"
msgstr ""
-#: templates/my_courses.xhtml:12 templates/tabbar.xhtml:7
+#: templates/my_courses.xhtml:12 templates/tabbar.xhtml:12
msgid "My Courses"
msgstr ""
@@ -49,30 +340,82 @@
msgid "You are not part of any courses at this time."
msgstr ""
-#: templates/tabbar.xhtml:6
-msgid "Home"
+#: templates/open_courses.xhtml:1
+msgid "Open Courses"
msgstr ""
-#: templates/tabbar.xhtml:8
-msgid "Add a Reserve"
+#: templates/open_courses.xhtml:19
+msgid "Term"
msgstr ""
-#: templates/tabbar.xhtml:9
-msgid "Manage Users"
+#: templates/open_courses.xhtml:19
+msgid "Code"
msgstr ""
-#: templates/welcome.xhtml:13
-msgid "Log in"
+#: templates/paginate.xhtml:21
+msgid "Previous"
msgstr ""
-#: templates/welcome.xhtml:14
-msgid "Search the Reserves"
+#: templates/paginate.xhtml:30
+msgid "Next"
msgstr ""
-#: templates/welcome.xhtml:16
+#: templates/search_results.xhtml:1
+msgid "Search Results"
+msgstr ""
+
+#: templates/search_results.xhtml:21
+msgid "You searched:"
+msgstr ""
+
+#: templates/search_results.xhtml:35
+msgid "Last Name"
+msgstr ""
+
+#: templates/search_results.xhtml:35
+msgid "First Name"
+msgstr ""
+
+#: templates/search_results.xhtml:44 templates/search_results.xhtml:62
+msgid "more...)"
+msgstr ""
+
+#: templates/search_results.xhtml:53
+msgid "Course"
+msgstr ""
+
+#: templates/tabbar.xhtml:10 templates/tabbar_anonymous.xhtml:10
+msgid "Home"
+msgstr ""
+
+#: templates/tabbar.xhtml:13
+msgid "Admin Options"
+msgstr ""
+
+#: templates/welcome.xhtml:12
msgid "News"
msgstr ""
+#: templates/welcome.xhtml:16
+msgid "posted"
+msgstr ""
+
+#: templates/admin/index.xhtml:1
+msgid "Administrative Options"
+msgstr ""
+
+#: templates/admin/term.xhtml:1
+msgid "Add a new Term"
+msgstr ""
+
+#: templates/admin/term.xhtml:15
+msgid "Save"
+msgstr ""
+
+#: templates/auth/login.xhtml:1
+msgid "Syrup E-Reserves: Please log in"
+msgstr ""
+
#: templates/auth/login.xhtml:10
msgid "$(function() {$('#userid').focus();});"
msgstr ""
@@ -81,11 +424,93 @@
msgid "Please log in."
msgstr ""
-#: templates/auth/login.xhtml:20
+#: templates/auth/login.xhtml:21
msgid "User ID:"
msgstr ""
-#: templates/auth/login.xhtml:24
+#: templates/auth/login.xhtml:25
msgid "Password:"
msgstr ""
+#: templates/auth/login.xhtml:29
+msgid "Log in"
+msgstr ""
+
+#: templates/components/course.xhtml:1
+msgid "search this course..."
+msgstr ""
+
+#: templates/components/course.xhtml:34
+msgid "about"
+msgstr ""
+
+#: templates/components/course.xhtml:35
+msgid "edit"
+msgstr ""
+
+#: templates/components/course.xhtml:47
+msgid "Top"
+msgstr ""
+
+#: templates/components/course.xhtml:54
+msgid "Add a new item:"
+msgstr ""
+
+#: templates/components/course.xhtml:56
+msgid "Subheading"
+msgstr ""
+
+#: templates/components/course.xhtml:58
+msgid "Electronic Document"
+msgstr ""
+
+#: templates/components/course.xhtml:59
+msgid "Physical Book/Document"
+msgstr ""
+
+#: templates/generic/delete.xhtml:1
+#, python-format
+msgid "Delete %s?"
+msgstr ""
+
+#: templates/generic/delete.xhtml:20
+msgid "Delete"
+msgstr ""
+
+#: templates/generic/delete.xhtml:21
+msgid "Cancel"
+msgstr ""
+
+#: templates/generic/edit.xhtml:1
+#, python-format
+msgid "Modify %s"
+msgstr ""
+
+#: templates/generic/edit.xhtml:1
+#, python-format
+msgid "Add %s"
+msgstr ""
+
+#: templates/generic/edit.xhtml:18
+msgid "Save changes"
+msgstr ""
+
+#: templates/generic/edit.xhtml:19
+msgid "Cancel changes"
+msgstr ""
+
+#: templates/generic/edit.xhtml:20
+msgid "Delete this record"
+msgstr ""
+
+#: templates/generic/index.xhtml:11
+msgid "$(function() { $('table').tablesorter(); });"
+msgstr ""
+
+#: templates/generic/index.xhtml:29
+msgid "Add"
+msgstr ""
+
+#~ msgid "published !!!"
+#~ msgstr ""
+
Modified: servres/trunk/conifer/locale/fr_CA/LC_MESSAGES/conifer-syrup.po
===================================================================
--- servres/trunk/conifer/locale/fr_CA/LC_MESSAGES/conifer-syrup.po 2009-03-04 01:33:21 UTC (rev 134)
+++ servres/trunk/conifer/locale/fr_CA/LC_MESSAGES/conifer-syrup.po 2009-03-04 01:33:53 UTC (rev 135)
@@ -9,7 +9,7 @@
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
"POT-Creation-Date: 2008-11-15 20:37+0500\n"
-"PO-Revision-Date: 2008-11-18 21:24-0500\n"
+"PO-Revision-Date: 2009-03-03 20:23-0500\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: fr_CA <LL at li.org>\n"
"Plural-Forms: nplurals=2; plural=(n > 1)\n"
@@ -18,31 +18,322 @@
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 0.9.4\n"
-#: templates/master.xhtml:26
+#: syrup/models.py:62
+msgid "custodian"
+msgstr ""
+
+#: syrup/models.py:63
+msgid "staff"
+msgstr ""
+
+#: syrup/models.py:64
+msgid "system administrator"
+msgstr ""
+
+#: syrup/models.py:156
+msgid "This is a moderated (non-public) course"
+msgstr ""
+
+#: syrup/models.py:218
+msgid "Instructor"
+msgstr ""
+
+#: syrup/models.py:219
+msgid "Proxy Instructor"
+msgstr ""
+
+#: syrup/models.py:220
+msgid "Student"
+msgstr ""
+
+#: syrup/models.py:255
+msgid "Attached Electronic Document"
+msgstr ""
+
+#: syrup/models.py:256
+msgid "Physical Book or Document"
+msgstr ""
+
+#: syrup/models.py:257 templates/item_add_url.xhtml:24
+#: templates/item_metadata.xhtml:22 templates/components/course.xhtml:57
+msgid "URL"
+msgstr ""
+
+#: syrup/models.py:258 templates/item_add_heading.xhtml:23
+msgid "Heading"
+msgstr ""
+
+#: syrup/models.py:312
+msgid "In Process"
+msgstr ""
+
+#: syrup/models.py:313
+msgid "Active"
+msgstr ""
+
+#: syrup/models.py:314
+msgid "InActive"
+msgstr ""
+
+#: syrup/models.py:396
+msgid "(Markdown not installed)."
+msgstr ""
+
+#: syrup/models.py:403
+msgid "plain text"
+msgstr ""
+
+#: syrup/models.py:404
+msgid "HTML"
+msgstr ""
+
+#: syrup/models.py:405
+msgid "Markdown"
+msgstr ""
+
+#: syrup/views.py:38
+msgid "Invalid username or password. Please try again."
+msgstr ""
+
+#: syrup/views.py:40
+msgid "Sorry, this account has been disabled."
+msgstr ""
+
+#: syrup/views.py:82
+msgid "Sorry..."
+msgstr ""
+
+#: syrup/views.py:83
+msgid "The Preferences page isn't ready yet."
+msgstr ""
+
+#: syrup/views.py:198
+msgid "not an editor"
+msgstr ""
+
+#: syrup/views.py:201
+msgid "No item_type parameter was provided."
+msgstr ""
+
+#: syrup/views.py:205
+msgid "Sorry, only HEADINGs, URLs and ELECs can be added right now."
+msgstr ""
+
+#: syrup/views.py:296
+msgid "Can only download ELEC documents!"
+msgstr ""
+
+#: syrup/views.py:434 templates/admin/index.xhtml:15
+msgid "Terms"
+msgstr ""
+
+#: syrup/views.py:446
+msgid "start must precede finish"
+msgstr ""
+
+#: syrup/views.py:456 templates/admin/index.xhtml:14
+msgid "Departments"
+msgstr ""
+
+#: syrup/views.py:472 templates/admin/index.xhtml:16
+msgid "News Items"
+msgstr ""
+
+#: templates/browse_courses.xhtml:1 templates/my_courses.xhtml:1
+msgid "Welcome to Syrup E-Reserves!"
+msgstr ""
+
+#: templates/browse_courses.xhtml:12 templates/tabbar.xhtml:11
+#: templates/tabbar_anonymous.xhtml:11
+msgid "Browse"
+msgstr ""
+
+#: templates/browse_courses.xhtml:12
+msgid ""
+"(Note: some course materials may require you\n"
+" to"
+msgstr ""
+
+#: templates/browse_courses.xhtml:13
+msgid "log in"
+msgstr ""
+
+#: templates/browse_courses.xhtml:14
+msgid "Choose from one of the options below:"
+msgstr ""
+
+#: templates/browse_courses.xhtml:16
+msgid "Browse by Instructor"
+msgstr ""
+
+#: templates/browse_courses.xhtml:17
+msgid "Browse by Department"
+msgstr ""
+
+#: templates/browse_courses.xhtml:18
+msgid "Browse by Course Name"
+msgstr ""
+
+#: templates/course_detail.xhtml:17
+msgid "There are no items associated with this course yet."
+msgstr ""
+
+#: templates/instructors.xhtml:1
+msgid "Instructors"
+msgstr ""
+
+#: templates/instructors.xhtml:12 templates/open_courses.xhtml:12
+#: templates/search_results.xhtml:14
+msgid "$(function() { $('.pagetable').tablesorter(); });"
+msgstr ""
+
+#: templates/instructors.xhtml:19
+msgid "Name"
+msgstr ""
+
+#: templates/item_add_elec.xhtml:1
+msgid "Edit an electronic document"
+msgstr ""
+
+#: templates/item_add_elec.xhtml:1
+msgid "Add a new electronic document"
+msgstr ""
+
+#: templates/item_add_elec.xhtml:13 templates/item_add_heading.xhtml:13
+#: templates/item_add_url.xhtml:13
+msgid "$(function() {$('input[@name=\"title\"]').focus();});"
+msgstr ""
+
+#: templates/item_add_elec.xhtml:25 templates/item_add_elec.xhtml:37
+msgid "Title of document"
+msgstr ""
+
+#: templates/item_add_elec.xhtml:28 templates/item_add_elec.xhtml:45
+msgid "File"
+msgstr ""
+
+#: templates/item_add_elec.xhtml:30
+msgid "Upload file and Create item"
+msgstr ""
+
+#: templates/item_add_elec.xhtml:40
+msgid "Update item"
+msgstr ""
+
+#: templates/item_add_elec.xhtml:42
+msgid "Replace the current file with a new file"
+msgstr ""
+
+#: templates/item_add_elec.xhtml:47
+msgid "Upload new file"
+msgstr ""
+
+#: templates/item_add_heading.xhtml:1
+msgid "Edit a subheading"
+msgstr ""
+
+#: templates/item_add_heading.xhtml:1
+msgid "Add a new subheading"
+msgstr ""
+
+#: templates/item_add_heading.xhtml:29
+msgid "Add heading"
+msgstr ""
+
+#: templates/item_add_heading.xhtml:30
+msgid "Update heading"
+msgstr ""
+
+#: templates/item_add_url.xhtml:1
+msgid "Edit a URL"
+msgstr ""
+
+#: templates/item_add_url.xhtml:1
+msgid "Add a new URL"
+msgstr ""
+
+#: templates/item_add_url.xhtml:23 templates/item_metadata.xhtml:19
+#: templates/open_courses.xhtml:19 templates/search_results.xhtml:70
+msgid "Title"
+msgstr ""
+
+#: templates/item_add_url.xhtml:27
+msgid "Add URL"
+msgstr ""
+
+#: templates/item_add_url.xhtml:28
+msgid "Update URL"
+msgstr ""
+
+#: templates/item_heading_detail.xhtml:20
+msgid "There are no items in this section."
+msgstr ""
+
+#: templates/item_metadata.xhtml:20
+msgid "Type"
+msgstr ""
+
+#: templates/item_metadata.xhtml:21 templates/search_results.xhtml:70
+msgid "Author"
+msgstr ""
+
+#: templates/item_metadata.xhtml:25
+msgid "Download"
+msgstr ""
+
+#: templates/item_metadata.xhtml:27
+msgid "Content type"
+msgstr ""
+
+#: templates/item_metadata.xhtml:28
+msgid "Content length"
+msgstr ""
+
+#: templates/master.xhtml:1
+msgid "Syrup E-Reserve System"
+msgstr ""
+
+#: templates/master.xhtml:1
+msgid "search..."
+msgstr ""
+
+#: templates/master.xhtml:43
msgid "Welcome,"
msgstr ""
-#: templates/master.xhtml:27
+#: templates/master.xhtml:44
msgid "Log Out"
msgstr ""
-#: templates/master.xhtml:28 templates/tabbar.xhtml:10
+#: templates/master.xhtml:45
msgid "Preferences"
msgstr ""
-#: templates/master.xhtml:29
+#: templates/master.xhtml:46
msgid "Admin UI"
msgstr ""
-#: templates/master.xhtml:32
+#: templates/master.xhtml:49 templates/welcome.xhtml:1
msgid "Welcome!"
msgstr ""
-#: templates/master.xhtml:39
+#: templates/master.xhtml:50
+msgid "Log In"
+msgstr ""
+
+#: templates/master.xhtml:67
+msgid "Start Over"
+msgstr ""
+
+#: templates/master.xhtml:68
+msgid "Syrup is a subproject of"
+msgstr ""
+
+#: templates/master.xhtml:69
msgid "Project Conifer"
msgstr ""
-#: templates/my_courses.xhtml:12 templates/tabbar.xhtml:7
+#: templates/my_courses.xhtml:12 templates/tabbar.xhtml:12
msgid "My Courses"
msgstr ""
@@ -50,30 +341,82 @@
msgid "You are not part of any courses at this time."
msgstr ""
-#: templates/tabbar.xhtml:6
-msgid "Home"
+#: templates/open_courses.xhtml:1
+msgid "Open Courses"
msgstr ""
-#: templates/tabbar.xhtml:8
-msgid "Add a Reserve"
+#: templates/open_courses.xhtml:19
+msgid "Term"
msgstr ""
-#: templates/tabbar.xhtml:9
-msgid "Manage Users"
+#: templates/open_courses.xhtml:19
+msgid "Code"
msgstr ""
-#: templates/welcome.xhtml:13
-msgid "Log in"
+#: templates/paginate.xhtml:21
+msgid "Previous"
msgstr ""
-#: templates/welcome.xhtml:14
-msgid "Search the Reserves"
+#: templates/paginate.xhtml:30
+msgid "Next"
msgstr ""
-#: templates/welcome.xhtml:16
+#: templates/search_results.xhtml:1
+msgid "Search Results"
+msgstr ""
+
+#: templates/search_results.xhtml:21
+msgid "You searched:"
+msgstr ""
+
+#: templates/search_results.xhtml:35
+msgid "Last Name"
+msgstr ""
+
+#: templates/search_results.xhtml:35
+msgid "First Name"
+msgstr ""
+
+#: templates/search_results.xhtml:44 templates/search_results.xhtml:62
+msgid "more...)"
+msgstr ""
+
+#: templates/search_results.xhtml:53
+msgid "Course"
+msgstr ""
+
+#: templates/tabbar.xhtml:10 templates/tabbar_anonymous.xhtml:10
+msgid "Home"
+msgstr ""
+
+#: templates/tabbar.xhtml:13
+msgid "Admin Options"
+msgstr ""
+
+#: templates/welcome.xhtml:12
msgid "News"
msgstr ""
+#: templates/welcome.xhtml:16
+msgid "posted"
+msgstr ""
+
+#: templates/admin/index.xhtml:1
+msgid "Administrative Options"
+msgstr ""
+
+#: templates/admin/term.xhtml:1
+msgid "Add a new Term"
+msgstr ""
+
+#: templates/admin/term.xhtml:15
+msgid "Save"
+msgstr ""
+
+#: templates/auth/login.xhtml:1
+msgid "Syrup E-Reserves: Please log in"
+msgstr ""
+
#: templates/auth/login.xhtml:10
msgid "$(function() {$('#userid').focus();});"
msgstr ""
@@ -82,11 +425,93 @@
msgid "Please log in."
msgstr ""
-#: templates/auth/login.xhtml:20
+#: templates/auth/login.xhtml:21
msgid "User ID:"
msgstr ""
-#: templates/auth/login.xhtml:24
+#: templates/auth/login.xhtml:25
msgid "Password:"
msgstr ""
+#: templates/auth/login.xhtml:29
+msgid "Log in"
+msgstr ""
+
+#: templates/components/course.xhtml:1
+msgid "search this course..."
+msgstr ""
+
+#: templates/components/course.xhtml:34
+msgid "about"
+msgstr ""
+
+#: templates/components/course.xhtml:35
+msgid "edit"
+msgstr ""
+
+#: templates/components/course.xhtml:47
+msgid "Top"
+msgstr ""
+
+#: templates/components/course.xhtml:54
+msgid "Add a new item:"
+msgstr ""
+
+#: templates/components/course.xhtml:56
+msgid "Subheading"
+msgstr ""
+
+#: templates/components/course.xhtml:58
+msgid "Electronic Document"
+msgstr ""
+
+#: templates/components/course.xhtml:59
+msgid "Physical Book/Document"
+msgstr ""
+
+#: templates/generic/delete.xhtml:1
+#, python-format
+msgid "Delete %s?"
+msgstr ""
+
+#: templates/generic/delete.xhtml:20
+msgid "Delete"
+msgstr ""
+
+#: templates/generic/delete.xhtml:21
+msgid "Cancel"
+msgstr ""
+
+#: templates/generic/edit.xhtml:1
+#, python-format
+msgid "Modify %s"
+msgstr ""
+
+#: templates/generic/edit.xhtml:1
+#, python-format
+msgid "Add %s"
+msgstr ""
+
+#: templates/generic/edit.xhtml:18
+msgid "Save changes"
+msgstr ""
+
+#: templates/generic/edit.xhtml:19
+msgid "Cancel changes"
+msgstr ""
+
+#: templates/generic/edit.xhtml:20
+msgid "Delete this record"
+msgstr ""
+
+#: templates/generic/index.xhtml:11
+msgid "$(function() { $('table').tablesorter(); });"
+msgstr ""
+
+#: templates/generic/index.xhtml:29
+msgid "Add"
+msgstr ""
+
+#~ msgid "published !!!"
+#~ msgstr ""
+
Modified: servres/trunk/conifer/syrup/models.py
===================================================================
--- servres/trunk/conifer/syrup/models.py 2009-03-04 01:33:21 UTC (rev 134)
+++ servres/trunk/conifer/syrup/models.py 2009-03-04 01:33:53 UTC (rev 135)
@@ -4,6 +4,8 @@
from django.contrib.auth import get_backends
from datetime import datetime
from genshi import Markup
+from gettext import gettext as _ # fixme, is this the right function to import?
+
import re
def highlight(text, phrase,
@@ -57,9 +59,9 @@
max_length=50, blank=True)
access_level = m.CharField(max_length=5, blank=True, null=True,
default=None,
- choices=(('CUST', 'custodian'),
- ('STAFF', 'staff'),
- ('ADMIN', 'system administrator')))
+ choices=(('CUST', _('custodian')),
+ ('STAFF', _('staff')),
+ ('ADMIN', _('system administrator'))))
instructor = m.BooleanField(default=False)
proxy = m.BooleanField(default=False)
# n.b. Django's User has an active flag, maybe we should use that?
@@ -151,10 +153,11 @@
term = m.ForeignKey(Term)
title = m.CharField(max_length=1024)
active = m.BooleanField(default=True)
- moderated = m.BooleanField('This is a moderated (non-public) course',
+ moderated = m.BooleanField(_('This is a moderated (non-public) course'),
default=False)
# Enrol-codes are used for SIS integration (graham's idea-in-progress)
+ # don't i18nize, I'm probably dropping this. vvvvv
enrol_codes = m.CharField('Registrar keys for class lists, pipe-separated',
max_length=4098,
blank=True, null=True)
@@ -212,9 +215,9 @@
user = m.ForeignKey(User)
role = m.CharField(
choices = (
- ('INSTR', 'Instructor'),
- ('PROXY', 'Proxy Instructor'),
- ('STUDT', 'Student')),
+ ('INSTR', _('Instructor')),
+ ('PROXY', _('Proxy Instructor')),
+ ('STUDT', _('Student'))),
default = 'STUDT',
max_length = 5)
@@ -249,10 +252,10 @@
course = m.ForeignKey(Course)
ITEM_TYPE_CHOICES = (
- ('ELEC', 'Attached Electronic Document'), # PDF, Doc, etc.
- ('PHYS', 'Physical Book or Document'),
- ('URL', 'URL'),
- ('HEADING', 'Heading'))
+ ('ELEC', _('Attached Electronic Document')), # PDF, Doc, etc.
+ ('PHYS', _('Physical Book or Document')),
+ ('URL', _('URL')),
+ ('HEADING', _('Heading')))
item_type = m.CharField(max_length=7, choices=ITEM_TYPE_CHOICES)
sort_order = m.IntegerField(default=0)
# parent must be a heading. could use ForeignKey.limit_choices_to,
@@ -306,9 +309,9 @@
# # who is the owner?
# owner_user_id = m.IntegerField(null=True,blank=True)
- STATUS_CHOICE = (('INPROCESS', 'In Process'), # physical, pending
- ('ACTIVE', 'Active'), # available
- ('INACTIVE', 'InActive')) # no longer on rsrv.
+ STATUS_CHOICE = (('INPROCESS', _('In Process')), # physical, pending
+ ('ACTIVE', _('Active')), # available
+ ('INACTIVE', _('InActive'))) # no longer on rsrv.
phys_status = m.CharField(max_length=9,
null=True, blank=True,
choices=STATUS_CHOICE,
@@ -390,16 +393,16 @@
return markdown.markdown(txt)
except ImportError:
def do_markdown(txt):
- return '(Markdown not installed).'
+ return _('(Markdown not installed).')
class NewsItem(m.Model):
subject = m.CharField(max_length=200)
body = m.TextField()
published = m.DateTimeField(default=datetime.now, blank=True, null=True)
encoding = m.CharField(max_length=10,
- choices = (('plain', 'plain'),
- ('html', 'html'),
- ('markdown', 'markdown')),
+ choices = (('plain', _('plain text')),
+ ('html', _('HTML')),
+ ('markdown', _('Markdown'))),
default = 'html')
def generated_body(self):
Modified: servres/trunk/conifer/syrup/views.py
===================================================================
--- servres/trunk/conifer/syrup/views.py 2009-03-04 01:33:21 UTC (rev 134)
+++ servres/trunk/conifer/syrup/views.py 2009-03-04 01:33:53 UTC (rev 135)
@@ -11,6 +11,7 @@
from django.db.models import Q
from datetime import datetime
from generics import *
+from gettext import gettext as _ # fixme, is this the right function to import?
#------------------------------------------------------------
# Authentication
@@ -34,9 +35,9 @@
next = request.POST['next']
user = authenticate(username=userid, password=password)
if user is None:
- return g.render('auth/login.xhtml', err='Invalid username or password. Please try again.', next=next)
+ return g.render('auth/login.xhtml', err=_('Invalid username or password. Please try again.'), next=next)
elif not user.is_active:
- return g.render('auth/login.xhtml', err='Sorry, this account has been disabled.', next=next)
+ return g.render('auth/login.xhtml', err=_('Sorry, this account has been disabled.'), next=next)
else:
login(request, user)
return HttpResponseRedirect(request.POST.get('next', '/syrup/'))
@@ -78,8 +79,8 @@
def user_prefs(request):
return g.render('simplemessage.xhtml',
- title='Sorry...',
- content='The Preferences page isn\'t ready yet.')
+ title=_('Sorry...'),
+ content=_('The Preferences page isn\'t ready yet.'))
def browse_courses(request, browse_option=''):
#the defaults should be moved into a config file or something...
@@ -194,14 +195,14 @@
course = parent_item.course
if not course.can_edit(request.user):
- return HttpResponseForbidden('not an editor') # fixme, prettier msg?
+ return HttpResponseForbidden(_('not an editor')) # fixme, prettier msg?
item_type = request.GET.get('item_type')
- assert item_type, 'No item_type parameter was provided.'
+ assert item_type, _('No item_type parameter was provided.')
# for the moment, only HEADINGs, URLs and ELECs can be added.
assert item_type in ('HEADING', 'URL', 'ELEC'), \
- 'Sorry, only HEADINGs, URLs and ELECs can be added right now.'
+ _('Sorry, only HEADINGs, URLs and ELECs can be added right now.')
if request.method == 'GET':
item = models.Item() # dummy object
@@ -292,7 +293,7 @@
def item_download(request, course_id, item_id, filename):
course = get_object_or_404(models.Course, pk=course_id)
item = get_object_or_404(models.Item, pk=item_id, course__id=course_id)
- assert item.item_type == 'ELEC', 'Can only download ELEC documents!'
+ assert item.item_type == 'ELEC', _('Can only download ELEC documents!')
fileiter = item.fileobj.chunks()
resp = HttpResponse(fileiter)
resp['Content-Type'] = item.fileobj_mimetype or 'application/octet-stream'
@@ -430,7 +431,7 @@
model = models.Term
class Index:
- title = 'Terms'
+ title = _('Terms')
all = models.Term.objects.order_by('start', 'code').all
cols = ['code', 'name', 'start', 'finish']
links = [0,1]
@@ -442,7 +443,7 @@
cd = self.cleaned_data
s, f = cd.get('start'), cd.get('finish')
if (s and f) and s >= f:
- raise ValidationError, 'start must precede finish'
+ raise ValidationError, _('start must precede finish')
return cd
admin_terms = generic_handler(TermForm)
@@ -452,7 +453,7 @@
model = models.Department
class Index:
- title = 'Departments'
+ title = _('Departments')
all = models.Department.objects.order_by('abbreviation').all
cols = ['abbreviation', 'name']
links = [0,1]
@@ -468,7 +469,7 @@
model = models.NewsItem
class Index:
- title = 'News Items'
+ title = _('News Items')
all = models.NewsItem.objects.order_by('-id').all
cols = ['id', 'subject', 'published']
links = [0, 1]
@@ -477,4 +478,3 @@
clean_body = strip_and_nonblank('body')
admin_news = generic_handler(NewsForm)
-
Modified: servres/trunk/conifer/templates/admin/index.xhtml
===================================================================
--- servres/trunk/conifer/templates/admin/index.xhtml 2009-03-04 01:33:21 UTC (rev 134)
+++ servres/trunk/conifer/templates/admin/index.xhtml 2009-03-04 01:33:53 UTC (rev 135)
@@ -1,5 +1,5 @@
<?python
-title = 'Administrative Options'
+title = _('Administrative Options')
?>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude"
Modified: servres/trunk/conifer/templates/admin/term.xhtml
===================================================================
--- servres/trunk/conifer/templates/admin/term.xhtml 2009-03-04 01:33:21 UTC (rev 134)
+++ servres/trunk/conifer/templates/admin/term.xhtml 2009-03-04 01:33:53 UTC (rev 135)
@@ -1,5 +1,5 @@
<?python
-title = 'Add a new Term'
+title = _('Add a new Term')
?>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude"
Modified: servres/trunk/conifer/templates/auth/login.xhtml
===================================================================
--- servres/trunk/conifer/templates/auth/login.xhtml 2009-03-04 01:33:21 UTC (rev 134)
+++ servres/trunk/conifer/templates/auth/login.xhtml 2009-03-04 01:33:53 UTC (rev 135)
@@ -1,5 +1,5 @@
<?python
-title = 'Syrup E-Reserves: Please log in'
+title = _('Syrup E-Reserves: Please log in')
?>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude"
Modified: servres/trunk/conifer/templates/browse_courses.xhtml
===================================================================
--- servres/trunk/conifer/templates/browse_courses.xhtml 2009-03-04 01:33:21 UTC (rev 134)
+++ servres/trunk/conifer/templates/browse_courses.xhtml 2009-03-04 01:33:53 UTC (rev 135)
@@ -1,5 +1,5 @@
<?python
-title = 'Welcome to Syrup E-Reserves!'
+title = _('Welcome to Syrup E-Reserves!')
?>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude"
Modified: servres/trunk/conifer/templates/components/course.xhtml
===================================================================
--- servres/trunk/conifer/templates/components/course.xhtml 2009-03-04 01:33:21 UTC (rev 134)
+++ servres/trunk/conifer/templates/components/course.xhtml 2009-03-04 01:33:53 UTC (rev 135)
@@ -1,3 +1,6 @@
+<?python
+searchtext = _('search this course...')
+?>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:py="http://genshi.edgewall.org/"
xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -8,8 +11,8 @@
<form method="get" action="${course.course_url('search')}"
onsubmit="if(q.value.replace(/^\s*/, '').replace(/\s*$/, '') =='') return false;">
<input id="q" name="q" maxlength="100" size="25" type="text"
- value="search this course..." onblur="if(this.value=='') this.value='search this course...';"
- onfocus="if(this.value=='search this course...') this.value='';"/>
+ value="${searchtext}" onblur="if(this.value=='') this.value='${searchtext}';"
+ onfocus="if(this.value=='${searchtext}') this.value='';"/>
</form>
</div>
Modified: servres/trunk/conifer/templates/generic/delete.xhtml
===================================================================
--- servres/trunk/conifer/templates/generic/delete.xhtml 2009-03-04 01:33:21 UTC (rev 134)
+++ servres/trunk/conifer/templates/generic/delete.xhtml 2009-03-04 01:33:53 UTC (rev 135)
@@ -1,5 +1,5 @@
<?python
-title = 'Delete %s?' % form.Meta.model.__name__
+title = _('Delete %s?') % form.Meta.model.__name__
?>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude"
Modified: servres/trunk/conifer/templates/generic/edit.xhtml
===================================================================
--- servres/trunk/conifer/templates/generic/edit.xhtml 2009-03-04 01:33:21 UTC (rev 134)
+++ servres/trunk/conifer/templates/generic/edit.xhtml 2009-03-04 01:33:53 UTC (rev 135)
@@ -1,8 +1,8 @@
<?python
if instance:
- title = 'Modify %s' % form.Meta.model.__name__
+ title = _('Modify %s') % form.Meta.model.__name__
else:
- title = 'Add %s' % form.Meta.model.__name__
+ title = _('Add %s') % form.Meta.model.__name__
?>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude"
Modified: servres/trunk/conifer/templates/instructors.xhtml
===================================================================
--- servres/trunk/conifer/templates/instructors.xhtml 2009-03-04 01:33:21 UTC (rev 134)
+++ servres/trunk/conifer/templates/instructors.xhtml 2009-03-04 01:33:53 UTC (rev 135)
@@ -1,5 +1,5 @@
<?python
-title = 'Instructors'
+title = _('Instructors')
?>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude"
Modified: servres/trunk/conifer/templates/item_add_elec.xhtml
===================================================================
--- servres/trunk/conifer/templates/item_add_elec.xhtml 2009-03-04 01:33:21 UTC (rev 134)
+++ servres/trunk/conifer/templates/item_add_elec.xhtml 2009-03-04 01:33:53 UTC (rev 135)
@@ -1,6 +1,6 @@
<?python
is_edit = bool(item.id)
-title = is_edit and 'Edit an electronic document' or 'Add a new electronic document'
+title = is_edit and _('Edit an electronic document') or _('Add a new electronic document')
course_title = '%s: %s (%s)' % (course.code, course.title, course.term)
?>
<html xmlns="http://www.w3.org/1999/xhtml"
Modified: servres/trunk/conifer/templates/item_add_heading.xhtml
===================================================================
--- servres/trunk/conifer/templates/item_add_heading.xhtml 2009-03-04 01:33:21 UTC (rev 134)
+++ servres/trunk/conifer/templates/item_add_heading.xhtml 2009-03-04 01:33:53 UTC (rev 135)
@@ -1,6 +1,6 @@
<?python
is_edit = bool(item.id)
-title = is_edit and 'Edit a subheading' or 'Add a new subheading'
+title = is_edit and _('Edit a subheading') or _('Add a new subheading')
course_title = '%s: %s (%s)' % (course.code, course.title, course.term)
?>
<html xmlns="http://www.w3.org/1999/xhtml"
Modified: servres/trunk/conifer/templates/item_add_url.xhtml
===================================================================
--- servres/trunk/conifer/templates/item_add_url.xhtml 2009-03-04 01:33:21 UTC (rev 134)
+++ servres/trunk/conifer/templates/item_add_url.xhtml 2009-03-04 01:33:53 UTC (rev 135)
@@ -1,6 +1,6 @@
<?python
is_edit = bool(item.id)
-title = is_edit and 'Edit a URL' or 'Add a new URL'
+title = is_edit and _('Edit a URL') or _('Add a new URL')
course_title = '%s: %s (%s)' % (course.code, course.title, course.term)
?>
<html xmlns="http://www.w3.org/1999/xhtml"
Modified: servres/trunk/conifer/templates/master.xhtml
===================================================================
--- servres/trunk/conifer/templates/master.xhtml 2009-03-04 01:33:21 UTC (rev 134)
+++ servres/trunk/conifer/templates/master.xhtml 2009-03-04 01:33:53 UTC (rev 135)
@@ -1,5 +1,6 @@
<?python
-app_name = 'Syrup E-Reserve System'
+app_name = _('Syrup E-Reserve System')
+search = _('search...')
?>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:py="http://genshi.edgewall.org/"
@@ -34,8 +35,8 @@
onsubmit="if(q.value.replace(/^\s*/, '').replace(/\s*$/, '') =='') return false;"
>
<input id="q" name="q" maxlength="100" size="25" type="text"
- value="search..." onblur="if(this.value=='') this.value='search...';"
- onfocus="if(this.value=='search...') this.value='';"/>
+ value="${search}" onblur="if(this.value=='') this.value='${search}';"
+ onfocus="if(this.value=='${search}') this.value='';"/>
</form>
</div>
<span py:if="user.is_authenticated()">
@@ -57,7 +58,7 @@
<div id="footer">
<div>
<!--
- We may eventually have a tab bar for non authenticated users,
+ !We may eventually have a tab bar for non authenticated users,
but we definitely need a start over option for now. There is
probably a more elegant way of detecting whether we are on
the front page but this works for the short term
Modified: servres/trunk/conifer/templates/my_courses.xhtml
===================================================================
--- servres/trunk/conifer/templates/my_courses.xhtml 2009-03-04 01:33:21 UTC (rev 134)
+++ servres/trunk/conifer/templates/my_courses.xhtml 2009-03-04 01:33:53 UTC (rev 135)
@@ -1,5 +1,5 @@
<?python
-title = 'Welcome to Syrup E-Reserves!'
+title = _('Welcome to Syrup E-Reserves!')
?>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude"
Modified: servres/trunk/conifer/templates/open_courses.xhtml
===================================================================
--- servres/trunk/conifer/templates/open_courses.xhtml 2009-03-04 01:33:21 UTC (rev 134)
+++ servres/trunk/conifer/templates/open_courses.xhtml 2009-03-04 01:33:53 UTC (rev 135)
@@ -1,5 +1,5 @@
<?python
-title = 'Open Courses'
+title = _('Open Courses')
?>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude"
Modified: servres/trunk/conifer/templates/search_results.xhtml
===================================================================
--- servres/trunk/conifer/templates/search_results.xhtml 2009-03-04 01:33:21 UTC (rev 134)
+++ servres/trunk/conifer/templates/search_results.xhtml 2009-03-04 01:33:53 UTC (rev 135)
@@ -1,5 +1,5 @@
<?python
-title = 'Search Results'
+title = _('Search Results')
instructors = instructor_list
courses = course_list
?>
Modified: servres/trunk/conifer/templates/tabbar.xhtml
===================================================================
--- servres/trunk/conifer/templates/tabbar.xhtml 2009-03-04 01:33:21 UTC (rev 134)
+++ servres/trunk/conifer/templates/tabbar.xhtml 2009-03-04 01:33:53 UTC (rev 135)
@@ -3,7 +3,7 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
py:strip="">
<!--
- eventually these should be customized based on user level
+ !eventually these should be customized based on user level
use one for now
-->
<ul id="tabbar">
@@ -12,7 +12,7 @@
<li class="active"><a href="/syrup/course/">My Courses</a></li>
<li><a href="/syrup/admin/">Admin Options</a></li>
<!--
- RD had a concept of "joining" which i am
+ !RD had a concept of "joining" which i am
suppressing for now, our staff is definitely
not keen on the idea and my small focus group
think it's way too much too expect for this
Modified: servres/trunk/conifer/templates/tabbar_anonymous.xhtml
===================================================================
--- servres/trunk/conifer/templates/tabbar_anonymous.xhtml 2009-03-04 01:33:21 UTC (rev 134)
+++ servres/trunk/conifer/templates/tabbar_anonymous.xhtml 2009-03-04 01:33:53 UTC (rev 135)
@@ -3,7 +3,7 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
py:strip="">
<!--
- eventually these should be customized based on user level
+ !eventually these should be customized based on user level
use one for now
-->
<ul id="tabbar">
Modified: servres/trunk/conifer/templates/welcome.xhtml
===================================================================
--- servres/trunk/conifer/templates/welcome.xhtml 2009-03-04 01:33:21 UTC (rev 134)
+++ servres/trunk/conifer/templates/welcome.xhtml 2009-03-04 01:33:53 UTC (rev 135)
@@ -1,5 +1,5 @@
<?python
-title = 'Welcome!'
+title = _('Welcome!')
?>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude"
More information about the open-ils-commits
mailing list