[open-ils-commits] r32 - in servres/trunk/conifer: locale locale/en_US/LC_MESSAGES locale/fr_CA/LC_MESSAGES syrup
svn at svn.open-ils.org
svn at svn.open-ils.org
Wed Nov 19 22:26:01 EST 2008
Author: gfawcett
Date: 2008-11-19 22:25:59 -0500 (Wed, 19 Nov 2008)
New Revision: 32
Modified:
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
Log:
intermediary commit before loading Art's changes
Modified: servres/trunk/conifer/locale/conifer-syrup.pot
===================================================================
--- servres/trunk/conifer/locale/conifer-syrup.pot 2008-11-20 00:46:51 UTC (rev 31)
+++ servres/trunk/conifer/locale/conifer-syrup.pot 2008-11-20 03:25:59 UTC (rev 32)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2008-11-16 22:13-0500\n"
+"POT-Creation-Date: 2008-11-18 21:24-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,30 +17,6 @@
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 0.9.4\n"
-#: templates/index.xhtml:12 templates/tabbar.xhtml:6
-msgid "My Courses"
-msgstr ""
-
-#: templates/index.xhtml:19
-msgid "You are not part of any courses at this time."
-msgstr ""
-
-#: templates/login.xhtml:10
-msgid "$(function() {$('#userid').focus();});"
-msgstr ""
-
-#: templates/login.xhtml:15
-msgid "Please log in."
-msgstr ""
-
-#: templates/login.xhtml:20
-msgid "User ID:"
-msgstr ""
-
-#: templates/login.xhtml:24
-msgid "Password:"
-msgstr ""
-
#: templates/master.xhtml:26
msgid "Welcome,"
msgstr ""
@@ -49,7 +25,7 @@
msgid "Log Out"
msgstr ""
-#: templates/master.xhtml:28 templates/tabbar.xhtml:9
+#: templates/master.xhtml:28 templates/tabbar.xhtml:10
msgid "Preferences"
msgstr ""
@@ -65,11 +41,51 @@
msgid "Project Conifer"
msgstr ""
-#: templates/tabbar.xhtml:7
+#: templates/my_courses.xhtml:12 templates/tabbar.xhtml:7
+msgid "My Courses"
+msgstr ""
+
+#: templates/my_courses.xhtml:19
+msgid "You are not part of any courses at this time."
+msgstr ""
+
+#: templates/tabbar.xhtml:6
+msgid "Home"
+msgstr ""
+
+#: templates/tabbar.xhtml:8
msgid "Add a Reserve"
msgstr ""
-#: templates/tabbar.xhtml:8
+#: templates/tabbar.xhtml:9
msgid "Manage Users"
msgstr ""
+#: templates/welcome.xhtml:13
+msgid "Log in"
+msgstr ""
+
+#: templates/welcome.xhtml:14
+msgid "Search the Reserves"
+msgstr ""
+
+#: templates/welcome.xhtml:16
+msgid "News"
+msgstr ""
+
+#: templates/auth/login.xhtml:10
+msgid "$(function() {$('#userid').focus();});"
+msgstr ""
+
+#: templates/auth/login.xhtml:15
+msgid "Please log in."
+msgstr ""
+
+#: templates/auth/login.xhtml:20
+msgid "User ID:"
+msgstr ""
+
+#: templates/auth/login.xhtml:24
+msgid "Password:"
+msgstr ""
+
Modified: servres/trunk/conifer/locale/en_US/LC_MESSAGES/conifer-syrup.po
===================================================================
--- servres/trunk/conifer/locale/en_US/LC_MESSAGES/conifer-syrup.po 2008-11-20 00:46:51 UTC (rev 31)
+++ servres/trunk/conifer/locale/en_US/LC_MESSAGES/conifer-syrup.po 2008-11-20 03:25:59 UTC (rev 32)
@@ -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-16 22:13-0500\n"
+"PO-Revision-Date: 2008-11-18 21:24-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,30 +17,6 @@
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 0.9.4\n"
-#: templates/index.xhtml:12 templates/tabbar.xhtml:6
-msgid "My Courses"
-msgstr ""
-
-#: templates/index.xhtml:19
-msgid "You are not part of any courses at this time."
-msgstr ""
-
-#: templates/login.xhtml:10
-msgid "$(function() {$('#userid').focus();});"
-msgstr ""
-
-#: templates/login.xhtml:15
-msgid "Please log in."
-msgstr ""
-
-#: templates/login.xhtml:20
-msgid "User ID:"
-msgstr ""
-
-#: templates/login.xhtml:24
-msgid "Password:"
-msgstr ""
-
#: templates/master.xhtml:26
msgid "Welcome,"
msgstr ""
@@ -49,7 +25,7 @@
msgid "Log Out"
msgstr ""
-#: templates/master.xhtml:28 templates/tabbar.xhtml:9
+#: templates/master.xhtml:28 templates/tabbar.xhtml:10
msgid "Preferences"
msgstr ""
@@ -65,14 +41,51 @@
msgid "Project Conifer"
msgstr ""
-#: templates/tabbar.xhtml:7
+#: templates/my_courses.xhtml:12 templates/tabbar.xhtml:7
+msgid "My Courses"
+msgstr ""
+
+#: templates/my_courses.xhtml:19
+msgid "You are not part of any courses at this time."
+msgstr ""
+
+#: templates/tabbar.xhtml:6
+msgid "Home"
+msgstr ""
+
+#: templates/tabbar.xhtml:8
msgid "Add a Reserve"
msgstr ""
-#: templates/tabbar.xhtml:8
+#: templates/tabbar.xhtml:9
msgid "Manage Users"
msgstr ""
-#~ msgid "Log In"
-#~ msgstr ""
+#: templates/welcome.xhtml:13
+msgid "Log in"
+msgstr ""
+#: templates/welcome.xhtml:14
+msgid "Search the Reserves"
+msgstr ""
+
+#: templates/welcome.xhtml:16
+msgid "News"
+msgstr ""
+
+#: templates/auth/login.xhtml:10
+msgid "$(function() {$('#userid').focus();});"
+msgstr ""
+
+#: templates/auth/login.xhtml:15
+msgid "Please log in."
+msgstr ""
+
+#: templates/auth/login.xhtml:20
+msgid "User ID:"
+msgstr ""
+
+#: templates/auth/login.xhtml:24
+msgid "Password:"
+msgstr ""
+
Modified: servres/trunk/conifer/locale/fr_CA/LC_MESSAGES/conifer-syrup.po
===================================================================
--- servres/trunk/conifer/locale/fr_CA/LC_MESSAGES/conifer-syrup.po 2008-11-20 00:46:51 UTC (rev 31)
+++ servres/trunk/conifer/locale/fr_CA/LC_MESSAGES/conifer-syrup.po 2008-11-20 03:25:59 UTC (rev 32)
@@ -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-16 22:13-0500\n"
+"PO-Revision-Date: 2008-11-18 21:24-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,30 +18,6 @@
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 0.9.4\n"
-#: templates/index.xhtml:12 templates/tabbar.xhtml:6
-msgid "My Courses"
-msgstr ""
-
-#: templates/index.xhtml:19
-msgid "You are not part of any courses at this time."
-msgstr ""
-
-#: templates/login.xhtml:10
-msgid "$(function() {$('#userid').focus();});"
-msgstr ""
-
-#: templates/login.xhtml:15
-msgid "Please log in."
-msgstr ""
-
-#: templates/login.xhtml:20
-msgid "User ID:"
-msgstr ""
-
-#: templates/login.xhtml:24
-msgid "Password:"
-msgstr ""
-
#: templates/master.xhtml:26
msgid "Welcome,"
msgstr ""
@@ -50,7 +26,7 @@
msgid "Log Out"
msgstr ""
-#: templates/master.xhtml:28 templates/tabbar.xhtml:9
+#: templates/master.xhtml:28 templates/tabbar.xhtml:10
msgid "Preferences"
msgstr ""
@@ -66,14 +42,51 @@
msgid "Project Conifer"
msgstr ""
-#: templates/tabbar.xhtml:7
+#: templates/my_courses.xhtml:12 templates/tabbar.xhtml:7
+msgid "My Courses"
+msgstr ""
+
+#: templates/my_courses.xhtml:19
+msgid "You are not part of any courses at this time."
+msgstr ""
+
+#: templates/tabbar.xhtml:6
+msgid "Home"
+msgstr ""
+
+#: templates/tabbar.xhtml:8
msgid "Add a Reserve"
msgstr ""
-#: templates/tabbar.xhtml:8
+#: templates/tabbar.xhtml:9
msgid "Manage Users"
msgstr ""
-#~ msgid "Log In"
-#~ msgstr ""
+#: templates/welcome.xhtml:13
+msgid "Log in"
+msgstr ""
+#: templates/welcome.xhtml:14
+msgid "Search the Reserves"
+msgstr ""
+
+#: templates/welcome.xhtml:16
+msgid "News"
+msgstr ""
+
+#: templates/auth/login.xhtml:10
+msgid "$(function() {$('#userid').focus();});"
+msgstr ""
+
+#: templates/auth/login.xhtml:15
+msgid "Please log in."
+msgstr ""
+
+#: templates/auth/login.xhtml:20
+msgid "User ID:"
+msgstr ""
+
+#: templates/auth/login.xhtml:24
+msgid "Password:"
+msgstr ""
+
Modified: servres/trunk/conifer/syrup/models.py
===================================================================
--- servres/trunk/conifer/syrup/models.py 2008-11-20 00:46:51 UTC (rev 31)
+++ servres/trunk/conifer/syrup/models.py 2008-11-20 03:25:59 UTC (rev 32)
@@ -26,7 +26,13 @@
user = m.ForeignKey(User, unique=True)
home_phone = m.CharField(max_length=100, blank=True)
home_address = m.TextField(blank=True)
-
+ ils_userid = m.TextField("Alternate userid in the ILS, if any",
+ 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')))
def __unicode__(self):
return 'UserProfile(%s)' % self.user
@@ -78,13 +84,14 @@
department = m.ForeignKey(Department)
term = m.ForeignKey(Term)
title = m.CharField(max_length=1024)
- # Enrol-codes are used for SIS integration.
+ active = m.BooleanField(default=True)
+ moderated = m.BooleanField('This is a moderated (non-public) course',
+ default=False)
+
+ # Enrol-codes are used for SIS integration (graham's idea-in-progress)
enrol_codes = m.CharField('Registrar keys for class lists, pipe-separated',
max_length=4098,
blank=True, null=True)
- active = m.BooleanField(default=True)
- moderated = m.BooleanField(default=False)
-
def __unicode__(self):
return self.code or self.title
More information about the open-ils-commits
mailing list