Changeset 420dc1 in indico

Timestamp:

07/28/09 10:53:04 (4 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, exp-instant-messaging, hello-world-walkthrough, ipv6, new-improved-taskdaemon, new-webex, prov-dual-interface, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

9e12cf

Parents:

2db9f1

git-author:

Cvetelina Angelova <csvetelina.angelova@…> (07/27/09 11:55:37)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (07/28/09 10:53:04)

Message:

[IMPORT] Import from Cveti's CVS tree

• i18n of several strings;
• Subheaders in room booking;

Location:

indico

Files:

• MaKaC/authentication/LocalAuthentication.py (modified) (1 diff)
• MaKaC/plugins/Collaboration/CERNMCU/__init__.py (modified) (1 diff)
• MaKaC/plugins/Collaboration/CERNMCU/options.py (modified) (4 diffs)
• MaKaC/plugins/Collaboration/EVO/__init__.py (modified) (1 diff)
• MaKaC/plugins/Collaboration/EVO/actions.py (modified) (1 diff)
• MaKaC/plugins/Collaboration/EVO/options.py (modified) (4 diffs)
• MaKaC/plugins/Collaboration/RecordingRequest/__init__.py (modified) (1 diff)
• MaKaC/plugins/Collaboration/RecordingRequest/options.py (modified) (6 diffs)
• MaKaC/plugins/Collaboration/__init__.py (modified) (1 diff)
• MaKaC/plugins/Collaboration/options.py (modified) (1 diff)
• MaKaC/plugins/EPayment/payPal/webinterface/pages/ePayments.py (modified) (2 diffs)
• MaKaC/plugins/RoomBooking/default/__init__.py (modified) (1 diff)
• MaKaC/registration.py (modified) (1 diff)
• MaKaC/user.py (modified) (3 diffs)
• MaKaC/webinterface/common/timezones.py (modified) (2 diffs)
• MaKaC/webinterface/mail.py (modified) (2 diffs)
• MaKaC/webinterface/pages/admins.py (modified) (7 diffs)
• MaKaC/webinterface/pages/base.py (modified) (2 diffs)
• MaKaC/webinterface/pages/help.py (modified) (1 diff)
• MaKaC/webinterface/pages/roomBooking.py (modified) (3 diffs)
• MaKaC/webinterface/rh/resetTimezone.py (modified) (2 diffs)
• MaKaC/webinterface/rh/users.py (modified) (3 diffs)
• MaKaC/webinterface/tpls/AdminPluginsOptionList.tpl (modified) (1 diff)
• MaKaC/webinterface/tpls/AdminsSystem.tpl (modified) (1 diff)
• MaKaC/webinterface/tpls/BeautifulHTMLDict.tpl (modified) (1 diff)
• MaKaC/webinterface/tpls/BeautifulHTMLList.tpl (modified) (1 diff)
• MaKaC/webinterface/tpls/ConfRegistrationFormDisplay.tpl (modified) (1 diff)
• MaKaC/webinterface/tpls/Help.tpl (modified) (1 diff)
• htdocs/js/indico/Legacy/Dialogs.js (modified) (16 diffs)
• htdocs/js/indico/Management/Timetable.js (modified) (12 diffs)
• htdocs/js/indico/MaterialEditor/Editor.js (modified) (23 diffs)

indico/MaKaC/authentication/LocalAuthentication.py

@@ -22 +22 @@
 from MaKaC.common.general import *
 from MaKaC.authentication.baseAuthentication import Authenthicator, PIdentity
-
+from MaKaC.i18n import _
 
 
 class LocalAuthenticator(Authenthicator):
     idxName = "localIdentities"
-    id = "Local"
+    id = _("Local")
     name = "Indico"
     desciption = "Indico Login"

indico/MaKaC/plugins/Collaboration/CERNMCU/__init__.py

@@ -21 +21 @@
 
 from MaKaC.plugins import getModules, initModule
+from MaKaC.i18n import _
 
 pluginType = "Collaboration"
-pluginName = "CERNMCU"
-pluginDescription = "Create conferences in CERN's MCU"
+pluginName = _("CERNMCU")
+pluginDescription = _("Create conferences in CERN's MCU")
 
 modules = {}

indico/MaKaC/plugins/Collaboration/CERNMCU/options.py

@@ -19 +19 @@
 ## along with CDS Indico; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+from MaKaC.i18n import _
 
 globalOptions = [
     #collaboration options necessary in all plugins
-    ("subtab", {"description" : "Subtab where CERN MCU will be placed",
+    ("subtab", {"description" : _("Subtab where CERN MCU will be placed"),
                "type": str,
                "defaultValue": "Collaboration",
@@ -28 +29 @@
                "visible": False,
                "mustReload": True} ),
-    ("allowedOn", {"description" : "Kind of event types (conference, meeting, simple_event) supported",
+    ("allowedOn", {"description" : _("Kind of event types (conference, meeting, simple_event) supported"),
                "type": list,
                "defaultValue": ["meeting"],
@@ -34 +35 @@
                "visible": False,
                "mustReload": True} ),
-    ("admins", {"description": "CERN MCU admins / responsibles",
+    ("admins", {"description": _("CERN MCU admins / responsibles"),
                       "type": 'users',
                       "defaultValue": [],
@@ -40 +41 @@
                       "visible": True} ),
     #CERN MCU Options
-    ("MCUAddress", {"description": "MCU URL",
+    ("MCUAddress", {"description": _("MCU URL"),
                       "type": str,
                       "defaultValue": "http://cern-mcu1.cern.ch",
                       "editable": True,
                       "visible": True}),
-    ("indicoID", {"description": "ID of Indico for the MCU",
+    ("indicoID", {"description": _("ID of Indico for the MCU"),
                       "type": str,
                       "defaultValue": "indico",
                       "editable": True,
                       "visible": True}),
-    ("indicoPassword", {"description": "Password of Indico for the MCU",
+    ("indicoPassword", {"description": _("Password of Indico for the MCU"),
                       "type": str,
                       "defaultValue": "",
                       "editable": True,
                       "visible": True}),
-    ("idRange", {"description": "Range of possible IDs (format: min-max)",
+    ("idRange", {"description": _("Range of possible IDs (format: min-max)"),
                       "type": str,
                       "defaultValue": "90000-99999",
                       "editable": True,
                       "visible": True}),
-    ("MCU_UTC_offset", {"description": "UTC offset of the MCU. Same value as 'UTC offset' in /settings_time.html of the MCU web interface",
+    ("MCU_UTC_offset", {"description": _("UTC offset of the MCU. Same value as 'UTC offset' in /settings_time.html of the MCU web interface"),
                       "type": int,
                       "defaultValue": 0,
                       "editable": True,
                       "visible": True}),
-    ("CERNGatekeeperPrefix", {"description": "CERN's gatekeeper prefix. Will be used for instructions on how to join the conference.",
+    ("CERNGatekeeperPrefix", {"description": _("CERN's gatekeeper prefix. Will be used for instructions on how to join the conference."),
                               "type": str,
                               "defaultValue": "98",
                               "editable": True,
                               "visible": True}),
-    ("GDSPrefix", {"description": "GDS prefix. Will be used for instructions on how to join the conference.",
+    ("GDSPrefix", {"description": _("GDS prefix. Will be used for instructions on how to join the conference."),
                     "type": str,
                     "defaultValue": "0041767027098",
                     "editable": True,
                     "visible": True}),
-    ("MCU_IP", {"description": "MCU's IP. Will be used for instructions on how to join the conference.",
+    ("MCU_IP", {"description": _("MCU's IP. Will be used for instructions on how to join the conference."),
                 "type": str,
                 "defaultValue": "137.138.248.216",
                 "editable": True,
                 "visible": True}),
-    ("Phone_number", {"description": "Phone number used to join by phone. Will be used for instructions on how to join the conference.",
+    ("Phone_number", {"description": _("Phone number used to join by phone. Will be used for instructions on how to join the conference."),
                               "type": str,
                               "defaultValue": "0041227670270",

indico/MaKaC/plugins/Collaboration/EVO/__init__.py

@@ -21 +21 @@
 
 from MaKaC.plugins import getModules, initModule
+from MaKaC.i18n import _
 
 pluginType = "Collaboration"
-pluginName = "EVO"
-pluginDescription = "EVO, the Collaboration network"
+pluginName = _("EVO")
+pluginDescription = _("EVO, the Collaboration network")
 
 modules = {}

indico/MaKaC/plugins/Collaboration/EVO/actions.py

@@ -22 +22 @@
 from MaKaC.plugins.base import ActionBase
 from MaKaC.plugins.Collaboration.EVO.common import EVOControlledException, getEVOAnswer, EVOException
+from MaKaC.i18n import _
 
 pluginActions = [
-    ("reloadCommunityList", {"buttonText": "Reload Community List",
+    ("reloadCommunityList", {"buttonText": _("Reload Community List"),
                             "associatedOption": "communityList"} )
 ]

indico/MaKaC/plugins/Collaboration/EVO/options.py

@@ -19 +19 @@
 ## along with CDS Indico; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+from MaKaC.i18n import _
 
 globalOptions = [
     #collaboration options necessary in all plugins
-    ("subtab", {"description" : "Subtab where EVO will be placed",
+    ("subtab", {"description" : _("Subtab where EVO will be placed"),
                "type": str,
                "defaultValue": "Collaboration",
@@ -28 +29 @@
                "visible": False,
                "mustReload": True} ),
-    ("allowedOn", {"description" : "Kind of event types (conference, meeting, simple_event) supported",
+    ("allowedOn", {"description" : _("Kind of event types (conference, meeting, simple_event) supported"),
                "type": list,
                "defaultValue": ["meeting"],
@@ -34 +35 @@
                "visible": False,
                "mustReload": True} ),
-    ("admins", {"description": "EVO admins / responsibles",
+    ("admins", {"description": _("EVO admins / responsibles"),
                       "type": 'users',
                       "defaultValue": [],
@@ -40 +41 @@
                       "visible": True} ),
     #EVO Options
-    ("sendMailNotifications", {"description" : "Should mail notifications be sent to EVO admins?",
+    ("sendMailNotifications", {"description" : _("Should mail notifications be sent to EVO admins?"),
                "type": bool,
                "defaultValue": False,
                "editable": True,
                "visible": True} ),
-    ("additionalEmails", {"description": "Additional email addresses who will receive notifications (always)",
+    ("additionalEmails", {"description": _("Additional email addresses who will receive notifications (always)"),
                           "type": list,
                           "defaultValue": [],
                           "editable": True,
                           "visible": True} ),
-    ("indicoUserID" , {"description" : "Indico user ID for EVO (right now: integer of max 8 digits)",
+    ("indicoUserID" , {"description" : _("Indico user ID for EVO (right now: integer of max 8 digits)"),
                       "type": str,
                       "defaultValue": ""} ),
-    ("indicoPassword" , {"description" : "Indico password for EVO (right now: integer of 4 digits)",
+    ("indicoPassword" , {"description" : _("Indico password for EVO (right now: integer of 4 digits)"),
                       "type": str,
                       "defaultValue": ""} ),
-    ("koalaLocation", {"description" : "Koala EVO client location",
+    ("koalaLocation", {"description" : _("Koala EVO client location"),
                       "type": str,
                       "defaultValue": "http://evo.caltech.edu/evoGate/koala.jnlp"} ),
-    ("httpServerLocation", {"description" : "EVO HTTP server location",
+    ("httpServerLocation", {"description" : _("EVO HTTP server location"),
                            "type": str,
                            "defaultValue": "http://vrvs-contrib.caltech.edu/evoGate/Api/"} ),
-    ("expirationTime", {"description" : "Expiration time in minutes",
+    ("expirationTime", {"description" : _("Expiration time in minutes"),
                            "type": int,
                            "defaultValue": 5} ),
-    ("communityList", {"description" : "List of EVO communities",
+    ("communityList", {"description" : _("List of EVO communities"),
                       "type": dict,
                       "defaultValue": {},
                       "editable": False} ),
-    ("verifyMinutes", {"description" : "Minutes to verify the booking before meeting",
+    ("verifyMinutes", {"description" : _("Minutes to verify the booking before meeting"),
                       "type": list,
                       "defaultValue": [10,30]} ),
-    ("allowedMinutes", {"description" : "Temporal margin around Indico event times where we allow EVO meeting creation (minutes)",
+    ("allowedMinutes", {"description" : _("Temporal margin around Indico event times where we allow EVO meeting creation (minutes)"),
                             "type": int,
                             "defaultValue": 60} ),
-    ("allowedPastMinutes", {"description" : "Time that we allow EVO meetings to be created in the past (minutes)",
+    ("allowedPastMinutes", {"description" : _("Time that we allow EVO meetings to be created in the past (minutes)"),
                             "type": int,
                             "defaultValue": 30} ),
-    ("APIMap", {"description" : "Map of actions and URLs",
+    ("APIMap", {"description" : _("Map of actions and URLs"),
                "type": dict,
                "defaultValue": {

indico/MaKaC/plugins/Collaboration/RecordingRequest/__init__.py

@@ -21 +21 @@
 
 from MaKaC.plugins import getModules, initModule
+from MaKaC.i18n import _
 
 pluginType = "Collaboration"
-pluginName = "RecordingRequest"
-pluginDescription = "Recording Request"
+pluginName = _("RecordingRequest")
+pluginDescription = _("Recording Request")
 
 modules = {}

indico/MaKaC/plugins/Collaboration/RecordingRequest/options.py

@@ -19 +19 @@
 ## along with CDS Indico; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+from MaKaC.i18n import _
 
 globalOptions = [
     #Collaboration options necessary in all plugins
-    ("subtab", {"description" : "Subtab where the Recording Request plugin will be placed",
+    ("subtab", {"description" : _("Subtab where the Recording Request plugin will be placed"),
                "type": str,
                "defaultValue": "Recording Request",
@@ -28 +29 @@
                "visible": False,
                "mustReload": True}),
-    ("allowedOn", {"description" : "Kind of event types (conference, meeting, simple_event) supported",
+    ("allowedOn", {"description" : _("Kind of event types (conference, meeting, simple_event) supported"),
                "type": list,
                "defaultValue": ["conference","simple_event","meeting"],
@@ -34 +35 @@
                "visible": False,
                "mustReload": True} ),
-    ("admins", {"description": "Recording Request admins / responsibles",
+    ("admins", {"description": _("Recording Request admins / responsibles"),
                       "type": 'users',
                       "defaultValue": [],
@@ -40 +41 @@
                       "visible": True} ),
     #RecordingRequest options
-    ("sendMailNotifications", {"description" : "Should mail notifications be sent to responsibles?",
+    ("sendMailNotifications", {"description" : _("Should mail notifications be sent to responsibles?"),
                "type": bool,
                "defaultValue": False,
                "editable": True,
                "visible": True} ),
-    ("additionalEmails", {"description": "Additional email addresses who will receive notifications (always)",
+    ("additionalEmails", {"description": _("Additional email addresses who will receive notifications (always)"),
                           "type": list,
                           "defaultValue": [],
@@ -51 +52 @@
                           "visible": True} ),
     
-    ("contributionWarnLimit", {"description" : "Allowed number of loaded contributions without warning",
+    ("contributionWarnLimit", {"description" : _("Allowed number of loaded contributions without warning"),
                "type": int,
                "defaultValue": 20,
@@ -57 +58 @@
                "visible": True} ),
                
-    ("ConsentFormURL", {"description" : "Recording consent form URL",
+    ("ConsentFormURL", {"description" : _("Recording consent form URL"),
                "type": str,
                "defaultValue": "",

indico/MaKaC/plugins/Collaboration/__init__.py

@@ -19 +19 @@
 ## along with CDS Indico; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-
-pluginTypeDescription = "Collaboration Tools Plugins"
+from MaKaC.i18n import _
+pluginTypeDescription = _("Collaboration Tools Plugins")
 #ignore = True

indico/MaKaC/plugins/Collaboration/options.py

@@ -19 +19 @@
 ## along with CDS Indico; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+from MaKaC.i18n import _
+
 
 globalOptions = [
-    ("collaborationAdmins", {"description": "Global collaboration admins",
+    ("collaborationAdmins", {"description": _("Global collaboration admins"),
                             "type": 'users',
                             "defaultValue": []} ),
-    ("useHTTPS", {"description": "Use HTTPS in collaboration pages?",
+    ("useHTTPS", {"description": _("Use HTTPS in collaboration pages?"),
                      "type" : bool,
                      "defaultValue": False} ),
-    ("startMinutes", {"description": "Default start time before Indico event start time (minutes)",
+    ("startMinutes", {"description": _("Default start time before Indico event start time (minutes)"),
                      "type" : int,
                      "defaultValue": 30} ),
-    ("pluginsPerEventType", {"description": "Plugins allowed for each event type",
+    ("pluginsPerEventType", {"description": _("Plugins allowed for each event type"),
                             "type": dict,
                             "editable": False,
                             "visible": True} ),
-    ("pluginsPerIndex", {"description": "Information about each index seen by collaboration admins",
+    ("pluginsPerIndex", {"description": _("Information about each index seen by collaboration admins"),
                          "type": list, #a list of IndexInformation objects
                          "editable": False,

indico/MaKaC/plugins/EPayment/payPal/webinterface/pages/ePayments.py

@@ -27 +27 @@
 from MaKaC.webinterface import urlHandlers
 import MaKaC
+from MaKaC.i18n import _
 
 from MaKaC.plugins.EPayment.payPal.webinterface.wcomponents import WTemplated
@@ -37 +38 @@
     def _createTabCtrl( self ):
         self._tabCtrl = wcomponents.TabControl()
-        self._tabMain = self._tabCtrl.newTab( "main", "Main", \
+        self._tabMain = self._tabCtrl.newTab( "main", _("Main"), \
                 localUrlHandlers.UHConfModifEPaymentPayPal.getURL( self._conf ) )
         wf = self._rh.getWebFactory()

indico/MaKaC/plugins/RoomBooking/default/__init__.py

@@ -23 +23 @@
 
 pluginType = "RoomBooking"
-pluginName = "default"
-pluginDescription = """This is the default Indico Room Booking plugin. It relies on a ZODB separate backend. It support custom room attributes, and equipment"""
+pluginName = _("default")
+pluginDescription = _("""This is the default Indico Room Booking plugin. It relies on a ZODB separate backend. It support custom room attributes, and equipment""")
 
 modules = {}

indico/MaKaC/registration.py

@@ -62 +62 @@
             self.setCurrency( _("not selected"))
         else:
-            self.activated = groupData.get("activated", False)
+            self.activated = groupData.get(_("activated"), False)
             self.title = groupData.get("name", "")
             self.announcement = groupData.get("announcement", "")

indico/MaKaC/user.py

@@ -867 +867 @@
             return self.status
         except AttributeError:
-            self.status = "activated"
+            self.status = _("activated")
             return self.status
     
@@ -878 +878 @@
     
     def activateAccount( self ):
-        self.setStatus("activated")
+        self.setStatus(_("activated"))
 
     def disabledAccount( self ):
@@ -884 +884 @@
     
     def isActivated( self ):
-        return self.status == "activated"
+        return self.status == _("activated")
     
     def isDisabled( self ):
-        return self.status == "disabled"
+        return self.status == _("disabled")
     
     def isNotConfirmed( self ):
-        return self.status == "Not confirmed"
+        return self.status == _("Not confirmed")
 
     def setId(self, id):

indico/MaKaC/webinterface/common/timezones.py

@@ -7 +7 @@
 from xml.sax.saxutils import quoteattr, escape
 from MaKaC.common.Configuration import Config
+from MaKaC.i18n import _
 
 
@@ -54 +55 @@
 
 class DisplayTimezoneRegistry:
-    _items = ['MyTimezone','Event Timezone']
+    _items = [_('MyTimezone'),_('Event Timezone')]
 
     def getList( self ):

indico/MaKaC/webinterface/mail.py

@@ -162 +162 @@
         minfo = HelperMaKaCInfo.getMaKaCInfoInstance()
         name = self._user.getStraightFullName()
-        text = _(""" _("Dear Administrator,
+        text = """ Dear Administrator,
 %s has created a new account in Indico.
 
-In order to activate it, please go to this URL"):
+In order to activate it, please go to this URL:
 <%s>
-""")% (name,urlHandlers.UHUserDetails.getURL( self._user ))
+"""% (name,urlHandlers.UHUserDetails.getURL( self._user ))
         maildata = { "fromAddr": "Indico Mailer<%s>" % minfo.getSupportEmail(), "toList": minfo.getAdminEmails(), "subject": _("[Indico] New account creation request"), "body": text }
         GenericMailer.send(GenericNotification(maildata))
@@ -179 +179 @@
         minfo = HelperMaKaCInfo.getMaKaCInfoInstance()
         name = self._user.getStraightFullName()
-        text = _("""Dear Administrator,
+        text = """Dear Administrator,
 %s has created a new account in Indico.
 <%s>
-""") % (name,urlHandlers.UHUserDetails.getURL( self._user ))
+""" % (name,urlHandlers.UHUserDetails.getURL( self._user ))
         maildata = { "fromAddr": "Indico Mailer<%s>" % minfo.getSupportEmail(), "toList": minfo.getAdminEmails(), "subject": _("[Indico] New account creation"), "body": text }
         GenericMailer.send(GenericNotification(maildata))

indico/MaKaC/webinterface/pages/admins.py

@@ -417 +417 @@
         self._tabCtrl = wcomponents.TabControl()
         
-        self._tabs["Main"] = self._tabCtrl.newTab("Main", "Main", urlHandlers.UHAdminPlugins.getURL())
+        self._tabs["Main"] = self._tabCtrl.newTab("Main", _("Main"), urlHandlers.UHAdminPlugins.getURL())
         
         pluginTypes = PluginsHolder().getPluginTypes(sorted = True)
@@ -475 +475 @@
         self._tabCtrl = wcomponents.TabControl()
         
-        self._subTabWebcast = self._tabCtrl.newTab( "webcast", "Webcast", \
+        self._subTabWebcast = self._tabCtrl.newTab( "webcast", _("Webcast"), \
                 urlHandlers.UHWebcast.getURL() )  
-        self._subTabWebcast_Live = self._subTabWebcast.newSubTab( "live", "Live", \
+        self._subTabWebcast_Live = self._subTabWebcast.newSubTab( "live", _("Live"), \
                 urlHandlers.UHWebcast.getURL() )  
-        self._subTabWebcast_Archive = self._subTabWebcast.newSubTab( "archive", "Archive", \
+        self._subTabWebcast_Archive = self._subTabWebcast.newSubTab( "archive", _("Archive"), \
                 urlHandlers.UHWebcastArchive.getURL() )  
-        self._subTabWebcast_Setup = self._subTabWebcast.newSubTab( "setup", "Setup", \
+        self._subTabWebcast_Setup = self._subTabWebcast.newSubTab( "setup", _("Setup"), \
                 urlHandlers.UHWebcastSetup.getURL() )  
-        self._subTabRecording = self._tabCtrl.newTab( "recording", "Recording", \
+        self._subTabRecording = self._tabCtrl.newTab( "recording", _("Recording"), \
                 urlHandlers.UHRecording.getURL() )       
-        self._subTabOAIPrivateConfig = self._tabCtrl.newTab( "oai-private", "OAI Private Gateway", \
+        self._subTabOAIPrivateConfig = self._tabCtrl.newTab( "oai-private", _("OAI Private Gateway"), \
                 urlHandlers.UHOAIPrivateConfig.getURL() )  
 
@@ -1363 +1363 @@
             changePassword = ""
             if item.getAuthenticatorTag() != "Local" :
-                changePassword = "External account"
+                changePassword = _("External account")
             else :
                 changeURL = urlHandlers.UHUserIdentityChangePassword.getURL()
@@ -1452 +1452 @@
         vars["activeButton"] = ""
         if self._currentUser in al.getList() and not self._avatar.isActivated():
-            vars["activeButton"] = """<form action="%s" method="POST"><td bgcolor="white" width="100%%"\
+            vars["activeButton"] = _("""<form action="%s" method="POST"><td bgcolor="white" width="100%%"\
                     valign="top" align="left">&nbsp;&nbsp;&nbsp;<input type="submit" class="btn" \
-                    value="activate the account"></td></form>"""%vars["activeURL"]
+                    value=" _("activate the account") "></td></form>""")%vars["activeURL"]
         vars["categoryManager"] = ""
         categs = u.getLinkTo("category","manager")
@@ -1668 +1668 @@
     def _getTabContent(self, params):
         
-        identity = self._avatar.getIdentityById(self._params["identityId"],"Local")
+        identity = self._avatar.getIdentityById(self._params["identityId"],_("Local"))
         c = WIdentityModification( self._avatar, identity )        
         postURL = urlHandlers.UHUserIdentityChangePassword.getURL()
@@ -2526 +2526 @@
         self._tabCtrl = wcomponents.TabControl()
 
-        self._subTabConfiguration = self._tabCtrl.newTab( "configuration", "Configuration", \
+        self._subTabConfiguration = self._tabCtrl.newTab( "configuration", _("Configuration"), \
                 urlHandlers.UHAdminsSystem.getURL() ) 
-        self._subTabTaskManager = self._tabCtrl.newTab( "tasks", "Task Manager", \
+        self._subTabTaskManager = self._tabCtrl.newTab( "tasks", _("Task Manager"), \
                 urlHandlers.UHTaskManager.getURL() ) 
-        self._subTabMaintenance = self._tabCtrl.newTab( "maintenance", "Maintenance", \
+        self._subTabMaintenance = self._tabCtrl.newTab( "maintenance", _("Maintenance"), \
                 urlHandlers.UHMaintenance.getURL() )
         
@@ -2719 +2719 @@
         if type == Alarm:
             taskList.sort(lambda x,y: cmp(x.getStartDate(),y.getStartDate()))
-            html.append("""<tr><td valign="top"><b>Alarm</b></td></tr>""")
-            html.append("""<tr><td><table><tr>
+            html.append(_("""<tr><td valign="top"><b>_("Alarm")</b></td></tr>"""))
+            html.append(_("""<tr><td><table><tr>
                     <td></td>
-                    <td><u>Id</u></td>
-                    <td><u>Conference</u></td>
-                    <td><u>Date</u></td></tr>""")
+                    <td><u>_("Id")</u></td>
+                    <td><u>_("Conference")</u></td>
+                    <td><u>_("Date")</u></td></tr>"""))
             for task in taskList:
                 delete = urlHandlers.UHRemoveTask.getURL()

indico/MaKaC/webinterface/pages/base.py

@@ -94 +94 @@
         from MaKaC.webinterface.rh.base import RHModificationBaseProtected
         from MaKaC.webinterface.rh.admins import RHAdminBase
+        from MaKaC.webinterface.rh.roomBooking import RHRoomBookingBase
+        from MaKaC.webinterface.rh.roomBooking import RHRoomBookingSearch4Rooms
+        from MaKaC.webinterface.rh.roomBooking import RHRoomBookingSearch4Bookings
+        from MaKaC.webinterface.rh.roomBooking import RHRoomBookingBookingList
+        from MaKaC.webinterface.rh.roomBooking import RHRoomBookingRoomDetails
+        from MaKaC.webinterface.rh.roomBooking import RHRoomBookingAdminBase
+        from MaKaC.webinterface.rh.calendar import RHCalendar
+        from MaKaC.webinterface.rh.categoryDisplay import RHCategoryMap
+        from MaKaC.webinterface.rh.categoryDisplay import RHCategoryStatistics
+        from MaKaC.webinterface.rh.newsDisplay import RHNews
+        from MaKaC.webinterface.rh.categoryDisplay import RHCategOverviewDisplay
         
         baseurl = self._getBaseURL()
@@ -101 +112 @@
             baseurl = baseurl.replace("http://","https://")
             baseurl = urlHandlers.setSSLPort( baseurl )
-            
+  
         area=""
         if isinstance(self._rh, RHModificationBaseProtected):
             area=_(""" - _("Management area")""")
-        elif isinstance(self._rh, RHAdminBase):
+        elif isinstance(self._rh, RHAdminBase) or isinstance(self._rh, RHRoomBookingAdminBase):
             area=_(""" - _("Administrator area")""")
+            
+        elif isinstance(self._rh, RHRoomBookingBase):            
+                if isinstance(self._rh, RHRoomBookingSearch4Rooms):
+                    area=_(""" - _("Room Booking - Search for Rooms")""")
+                elif isinstance(self._rh, RHRoomBookingSearch4Bookings):
+                    area=_(""" - _("Room Booking - Search Bookings")""")
+                elif isinstance( self._rh, RHRoomBookingRoomDetails ): 
+                    area=_(""" - _("Room Booking - Room Details")""")
+                elif isinstance(self._rh, RHRoomBookingBookingList):
+                    if self._rh._today:
+                        area=_(""" - _("Room Booking - Calendar")""")
+                    elif self._rh._onlyMy and self._rh._onlyPrebookings:
+                        area=_(""" - _("Room Booking - My PRE-bookings")""")
+                    elif self._rh._onlyMy:
+                        area=_(""" - _("Room Booking - My bookings")""")
+                    elif self._rh._ofMyRooms and self._rh._onlyPrebookings:
+                        area=_(""" - _("Room Booking - PRE-bookings in my rooms")""")
+                    elif self._rh._today and self._rh._ofMyRooms:
+                        area=_(""" - _("Room Booking - Bookings in my rooms") """)
+                   
+        elif isinstance(self._rh, RHCalendar):
+                area=_(""" - _("Calendar Overview")""")
+        elif isinstance(self._rh, RHCategoryMap):
+                area=_(""" - _("Category Map")""")
+        elif isinstance(self._rh, RHCategoryStatistics):
+                area=_(""" - _("Category Statistics")""")
+        elif isinstance(self._rh, RHNews):
+                area=_(""" - _("News")""")
+        elif isinstance(self._rh, RHCategOverviewDisplay):
+                area=_(""" - _("Events Display")""")
+                   
+                                                     
         
         return wcomponents.WHTMLHeader().getHTML({

indico/MaKaC/webinterface/pages/help.py

@@ -27 +27 @@
 class WPHelp(WPMainBase):
     def _getNavigationDrawer(self):
-        return wcomponents.WSimpleNavigationDrawer("Help", urlHandlers.UHConferenceHelp.getURL )
+        return wcomponents.WSimpleNavigationDrawer(_("Help"), urlHandlers.UHConferenceHelp.getURL )
 
     def _getBody(self, params):

indico/MaKaC/webinterface/pages/roomBooking.py

@@ -26 +26 @@
 from MaKaC.rb_location import CrossLocationDB
 import MaKaC.common.info as info
+from MaKaC.webinterface.rh.base import RH
 
 #import MaKaC.common.info as info
@@ -193 +194 @@
         return wc.getHTML( params )
 
-class WPRoomBookingSearch4Users( WPRoomBookingBase ):
+class WPRoomBookingSearch4Users( WPRoomBookingBase, RH ):
     def __init__( self, rh ):
         self._rh = rh
@@ -203 +204 @@
              forceWithoutExtAuth = self._rh._forceWithoutExtAuth,
              multi = False )
-        params["addURL"] = urlHandlers.UHRoomBookingRoomForm.getURL()
-        return wc.getHTML( params )
+        params["addURL"] = urlHandlers.UHRoomBookingRoomForm.getURL(None)
+        url = urlHandlers.UHRoomBookingRoomForm.getURL( None )        
+        return wc.getHTML( self._redirect( url ), params )
 
 # 2. List of ...

indico/MaKaC/webinterface/rh/resetTimezone.py

@@ -4 +4 @@
 from mod_python import util
 import MaKaC.common.info as info
+from MaKaC.i18n import _
 
 class RHResetTZ(base.RH):
@@ -25 +26 @@
                 user = sess.getUser()
                 if tz == "LOCAL":
-                    user.setDisplayTZMode("Event Timezone")
+                    user.setDisplayTZMode(_("Event Timezone"))
                 else:
                     user.setTimezone(tz)
-                    user.setDisplayTZMode("MyTimezone")
+                    user.setDisplayTZMode(_("MyTimezone"))
         except:
             pass

indico/MaKaC/webinterface/rh/users.py

@@ -180 +180 @@
                     _UserUtils.setUserData( a, self._params )
                     li = user.LoginInfo( self._params["login"], self._params["password"] )   
-                    id = ih.createIdentity( li, a, "Local" )
+                    id = ih.createIdentity( li, a, _("Local") )
                     ih.add( id )
                     DBMgr.getInstance().commit()
@@ -194 +194 @@
                 ah.add(a)
                 li = user.LoginInfo( self._params["login"], self._params["password"] )   
-                id = ih.createIdentity( li, a, "Local" )
+                id = ih.createIdentity( li, a, _("Local") )
                 ih.add( id )
                 DBMgr.getInstance().commit()
@@ -599 +599 @@
                 p = adminPages.WPIdentityChangePassword( self, self._avatar, self._params )        
                 return p.display()
-            identity = self._avatar.getIdentityById(self._params["login"],"Local")
+            identity = self._avatar.getIdentityById(self._params["login"],_("Local"))
             identity.setPassword(self._params["password"])
             p = adminPages.WPUserDetails( self, self._avatar )

indico/MaKaC/webinterface/tpls/AdminPluginsOptionList.tpl

@@ -154 +154 @@
         <tr>
             <td colspan="2" style="text-align: right;">
-                <input type="submit" name="Save" value="Save" />
+                <input type="submit" name="Save" value="<%= _("Save") %>" />
             </td>
         </tr>

indico/MaKaC/webinterface/tpls/AdminsSystem.tpl

@@ -12 +12 @@
       <td rowspan="4" valign="top">
         <form action="%(ModifURL)s" method="POST">
-        <input type="submit" class="btn" value="modify">
+        <input type="submit" class="btn" value="<%= _("modify")%>">
         </form>
       </td>

indico/MaKaC/webinterface/tpls/BeautifulHTMLDict.tpl

@@ -10 +10 @@
 <% end %>
 <% else: %>
-(Empty)
+<%= _("(Empty)")%>
 <% end %>
 </div>

indico/MaKaC/webinterface/tpls/BeautifulHTMLList.tpl

@@ -10 +10 @@
 <% end %>
 <% else: %>
-(Empty)
+<%= _("(Empty)")%>
 <% end %>
 </div>

indico/MaKaC/webinterface/tpls/ConfRegistrationFormDisplay.tpl

@@ -15 +15 @@
     <tr>
         <td colspan="2" align="left">
-            <br><b><%= _(""" _("Please, note that fields marked with") <font color="red">*</font> _("are mandatory") """)%></b><br>
+            <br><b><%= _("""Please, note that fields marked with <font color="red">*</font> are mandatory""")%></b><br>
         </td>
     </tr>

indico/MaKaC/webinterface/tpls/Help.tpl

@@ -90 +90 @@
 
     <br/>
-    <p><em>You can find more user guides, in different languages, provided by external collaborators <a href="https://espace.cern.ch/indico-soft/users/default.aspx">here</a>.</em></p>
+    <p><em><%= _("You can find more user guides, in different languages, provided by external collaborators") %> <a href="https://espace.cern.ch/indico-soft/users/default.aspx">here</a>.</em></p>
 
 </div>

indico/htdocs/js/indico/Legacy/Dialogs.js

@@ -68 +68 @@
 
                        var popup = new ExclusivePopup(
-                           'Add Break',
+                           $T('Add Break'),
                            function() {
                                popup.close();
@@ -76 +76 @@
                            var self = this;
 
-                           var addButton = Html.button({}, "Add");
-                           var cancelButton = Html.button({}, "Cancel");
+                           var addButton = Html.button({}, $T("Add"));
+                           var cancelButton = Html.button({}, $T("Cancel"));
                            cancelButton.dom.style.marginLeft = pixels(10);
 
@@ -99 +99 @@
                            return self.ExclusivePopup.prototype.draw.call(
                                this,
-                               Widget.block([IndicoUtil.createFormFromMap([['Title', $B(Html.edit({
+                               Widget.block([IndicoUtil.createFormFromMap([[$T('Title'), $B(Html.edit({
                                    style: {
                                        width: '300px'
                                    }
-                               }), info.accessor('title'))], ['Description', $B(Html.textarea({
+                               }), info.accessor('title'))], [$T('Description'), $B(Html.textarea({
                                    cols: 40,
                                    rows: 2
-                               }), info.accessor('description'))], ['Place', roomEditor.draw()], ['Date/Time', dateTimeField.element]]),
+                               }), info.accessor('description'))], [$T('Place'), roomEditor.draw()], [$T('Date/Time'), dateTimeField.element]]),
                                              Html.div('dialogButtons',
                                                       [addButton, cancelButton])]));
@@ -171 +171 @@
                        };
 
-                       var popup = new ExclusivePopup('Add Session');
+                       var popup = new ExclusivePopup($T('Add Session'));
 
                        popup.draw = function(){
                            var self = this;
-                           var addButton = Html.button({},"Add");
-                           var cancelButton = Html.button({},"Cancel");
+                           var addButton = Html.button({},$T("Add"));
+                           var cancelButton = Html.button({},$T("Cancel"));
                            cancelButton.dom.style.marginLeft = pixels(10);
 
@@ -203 +203 @@
                            $B(info.accessor('conveners'), convListWidget.getUsers());
 
-                           var sesType = new RadioFieldWidget({'standard':'Standard','poster':'Poster'},['standard','poster'],'nobulletsListInline');
+                           var sesType = new RadioFieldWidget({'standard':$T('Standard'),'poster':$T('Poster')},['standard','poster'],'nobulletsListInline');
                            sesType.select('standard');
                            $B(info.accessor('sessionType'), sesType.state);
@@ -210 +210 @@
                                this,
                                Widget.block([IndicoUtil.createFormFromMap([
-                                   ['Title', $B(parameterManager.add(Html.edit({style: {width: '300px'}}), 'text', false), info.accessor('title'))],
-                                   ['Description', $B(Html.textarea({cols: 40, rows: 2}), info.accessor('description'))],
-                                   ['Place', Html.div({style: {marginBottom: '15px'}}, roomEditor.draw())],
-                                   ['Start Date/Time', $B(parameterManager.add(IndicoUI.Widgets.Generic.dateField(true), 'datetime', false), info.accessor('startDateTime')) ],
-                                   ['End Date/Time', $B(parameterManager.add(IndicoUI.Widgets.Generic.dateField(true), 'datetime', false), info.accessor('endDateTime')) ],
-                                   ['Convener(s)', convListWidget.draw()],
-                                   ['Session type', sesType.draw()]
+                                   [$T('Title'), $B(parameterManager.add(Html.edit({style: {width: '300px'}}), 'text', false), info.accessor('title'))],
+                                   [$T('Description'), $B(Html.textarea({cols: 40, rows: 2}), info.accessor('description'))],
+                                   [$T('Place'), Html.div({style: {marginBottom: '15px'}}, roomEditor.draw())],
+                                   [$T('Start Date/Time'), $B(parameterManager.add(IndicoUI.Widgets.Generic.dateField(true), 'datetime', false), info.accessor('startDateTime')) ],
+                                   [$T('End Date/Time'), $B(parameterManager.add(IndicoUI.Widgets.Generic.dateField(true), 'datetime', false), info.accessor('endDateTime')) ],
+                                   [$T('Convener(s)'), convListWidget.draw()],
+                                   [$T('Session type'), sesType.draw()]
                                ]), Html.div('dialogButtons',[addButton, cancelButton])
-                                            ]));
+                               ]));
                        };
                        popup.open();
@@ -294 +294 @@
 
                        var popup = new ExclusivePopup(
-                           'Add Session Slot',
+                           $T('Add Session Slot'),
                            function() {
                                popup.close();
@@ -301 +301 @@
                        popup.draw = function() {
                            var self = this;
-                           var addButton = Html.button({}, "Add");
-                           var cancelButton = Html.button({}, "Cancel");
+                           var addButton = Html.button({}, $T("Add"));
+                           var cancelButton = Html.button({}, $T("Cancel"));
                            cancelButton.dom.style.marginLeft = pixels(10);
 
@@ -332 +332 @@
                            return this.ExclusivePopup.prototype.draw.call(
                                this,
-                               Widget.block([IndicoUtil.createFormFromMap([['Title',
+                               Widget.block([IndicoUtil.createFormFromMap([[$T('Title'),
                                                                             $B(Html.edit({
                                                                                 style: { width: '300px'}
                                                                             }), info.accessor('title'))],
-                                                                           ['Place', Html.div({style: {marginBottom: '15px'}}, roomEditor.draw())], ['Date/Time', dateTimeField.element],
-                                                                           ['Convener(s)', convListWidget.draw()]]),
+                                                                           [$T('Place'), Html.div({style: {marginBottom: '15px'}}, roomEditor.draw())], [$T('Date/Time'), dateTimeField.element],
+                                                                           [$T('Convener(s)'), convListWidget.draw()]]),
                                              Html.div('dialogButtons',
                                                       [addButton, cancelButton])]
@@ -396 +396 @@
 
                    var popup = new ExclusivePopup(
-                       'Add Subcontribution',
+                       $T('Add Subcontribution'),
                        function() {
                            popup.close();
@@ -404 +404 @@
                        var self = this;
 
-                       var addButton = Html.button({},"Add");
-                       var cancelButton = Html.button({},"Cancel");
+                       var addButton = Html.button({},$T("Add"));
+                       var cancelButton = Html.button({},$T("Cancel"));
                        cancelButton.dom.style.marginLeft = pixels(10);
 
@@ -434 +434 @@
                            this,
                            Widget.block([IndicoUtil.createFormFromMap([
-                               ['Title', $B(parameterManager.add(Html.edit({style: {width: '300px'}}), 'text', false), info.accessor('title'))],
-                               ['Description', $B(Html.textarea({cols: 40, rows: 2}), info.accessor('description'))],
-                               ['Keywords', keywordField.element],
-                               ['Duration (min) ', $B(parameterManager.add(IndicoUI.Widgets.Generic.durationField(), 'int', false), info.accessor('duration')) ],
-                               ['Presenter(s)', presListWidget.draw()]
+                               [$T('Title'), $B(parameterManager.add(Html.edit({style: {width: '300px'}}), 'text', false), info.accessor('title'))],
+                               [$T('Description'), $B(Html.textarea({cols: 40, rows: 2}), info.accessor('description'))],
+                               [$T('Keywords'), keywordField.element],
+                               [$T('Duration (min) '), $B(parameterManager.add(IndicoUI.Widgets.Generic.durationField(), 'int', false), info.accessor('duration')) ],
+                               [$T('Presenter(s)'), presListWidget.draw()]
                            ]),
                                          Html.div({style:{marginTop: pixels(10), textAlign: 'center', background: '#DDDDDD', padding: pixels(2)}},
@@ -524 +524 @@
 
                var popup = new ExclusivePopup(
-                   'My minutes',
+                   $T('My minutes'),
                    function() {
                        popup.close();
@@ -533 +533 @@
                    var content = Html.div({}, rtWidget.draw());
 
-                   saveButton = Widget.button(command(curry(commitChanges, function(){self.close();}), "Save"));
+                   saveButton = Widget.button(command(curry(commitChanges, function(){self.close();}), $T("Save")));
                    saveButton.dom.disabled = !compileMinutes;
 
@@ -549 +549 @@
                        commitChanges(suicideHook, closeMinutes);
                    };
-
-                   saveCloseButton = Widget.button(command(curry(commitChangesAndClose, function(){self.close();}), "Save and close"));
+                   saveCloseButton = Widget.button(command(curry(commitChangesAndClose, function(){self.close()}), $T("Save and close")));
                    saveCloseButton.dom.disabled = !compileMinutes;
 
@@ -561 +560 @@
                                          saveButton,
                                          saveCloseButton,
-                                         Widget.button(command(closeMinutes, "Close")))));
+                                         Widget.button(command(closeMinutes, $T("Close"))))));
                };
 

indico/htdocs/js/indico/Management/Timetable.js

@@ -156 +156 @@
                                       Html.div("UnscheduledContribListDiv",
                                                unscheduledList.draw()),
-                                      this.dayList.length==1?'':["Add to ", daySelect],
+                                      this.dayList.length==1?'':[$T("Add to "), daySelect],
                                       Widget.button(command(function() {
                                           self.addExisting(unscheduledList.getList(),
                                                            daySelect.get());
-                                      }, "Add selected"))
+                                      }, $T("Add selected")))
                                      )));
 
@@ -258 +258 @@
             self.favorites,
             true, true, true,
-            userListNothing, userListNothing, userListNothing, false, {"presenter-grant-submission": ["submission rights", true]},
+            userListNothing, userListNothing, userListNothing, false, {"presenter-grant-submission": [$T("submission rights"), true]},
             self.args.conference
         );
@@ -267 +267 @@
             $B(info.accessor('dateTime'), self.dateTimeField.accessor.accessor('dateTime'));
             $B(info.accessor('duration'), self.dateTimeField.accessor.accessor('duration'));
-            datecomponent = ['Date/Time', self.dateTimeField.element];
+            datecomponent = [$T('Date/Time'), self.dateTimeField.element];
         }else{
             $B(info.accessor('duration'), self.dateTimeField);
-            datecomponent = ['Duration', self.dateTimeField]
+            datecomponent = [$T('Duration'), self.dateTimeField]
         }
 
@@ -276 +276 @@
             [
                 [
-                    'Title',
+                    $T('Title'),
                     $B(Html.edit({}),
                        info.accessor('title'))
                 ],
-                ['Place', Html.div({style: {marginBottom: '15px'}}, roomEditor.draw())],
+                [$T('Place'), Html.div({style: {marginBottom: '15px'}}, roomEditor.draw())],
                 datecomponent,
-                ['Presenter(s)', presListWidget.draw()]
+                [$T('Presenter(s)'), presListWidget.draw()]
             ]);
 
@@ -295 +295 @@
         if (!this.isConference) {
             // if it's a meeting, just add a description
-            fields = [['Description',$B(Html.textarea({cols: 50,rows: 2}),
+            fields = [[$T('Description'),$B(Html.textarea({cols: 50,rows: 2}),
                                        info.accessor('field_content'))]];
         } else {
@@ -306 +306 @@
         }
 
-        fields.push(['Keywords', keywordField.element]);
+        fields.push([$T('Keywords'), keywordField.element]);
         $B(info.accessor('keywords'), keywordField.accessor);
 
@@ -321 +321 @@
             self.favorites,
             true, true, true,
-            userListNothing, userListNothing, userListNothing, false, {"author-grant-submission": ["submission rights", true]},
+            userListNothing, userListNothing, userListNothing, false, {"author-grant-submission": [$T("submission rights"), true]},
             this.args.conference);
 
@@ -330 +330 @@
             self.favorites,
             true, true, true,
-            userListNothing, userListNothing, userListNothing, false, {"coauthor-grant-submission": ["submission rights", true]},
+            userListNothing, userListNothing, userListNothing, false, {"coauthor-grant-submission": [$T("submission rights"), true]},
             this.args.conference);
 
@@ -339 +339 @@
         return IndicoUtil.createFormFromMap(
             [
-                ['Author(s)', authorListWidget.draw()],
-                ['Co-author(s)', coauthorListWidget.draw()]
+                [$T('Author(s)'), authorListWidget.draw()],
+                [$T('Co-author(s)'), coauthorListWidget.draw()]
             ]); 
     },
@@ -368 +368 @@
         };
 
-        var addButton = Html.button({},"Add");
-        var cancelButton = Html.button({}, "Cancel");
+        var addButton = Html.button({},$T("Add"));
+        var cancelButton = Html.button({}, $T("Cancel"));
 
         cancelButton.observeClick(function(){
@@ -382 +382 @@
         cancelButton.dom.style.marginLeft = pixels(10);
 
-        var tabs = [["Basic", self._drawMainTab(info)]];
+        var tabs = [[$T("Basic"), self._drawMainTab(info)]];
 
         if (this.isConference) {
-            tabs.push(["Authors", self._drawAuthorsTab(info)]);
+            tabs.push([$T("Authors"), self._drawAuthorsTab(info)]);
         }
 
-        tabs.push(["Advanced", self._drawAdvancedTab(info)]);
+        tabs.push([$T("Advanced"), self._drawAdvancedTab(info)]);
         var tabWidget = new TabWidget(tabs, 600, 400);
 
@@ -430 +430 @@
              });
 
-         this.ServiceDialog(Indico.Urls.JsonRpcService, method, args, "Add Contribution",
+         this.ServiceDialog(Indico.Urls.JsonRpcService, method, args, $T("Add Contribution"),
                             function() {
                                 self.close();

indico/htdocs/js/indico/MaterialEditor/Editor.js

@@ -38 +38 @@
                                               return Html.option({'value': value}, value);
                                           }),
-                         " or ",
+                         " ",
+                         $T("or"),
+                         " ",
                          Widget.link(command(function() {
                              chooser.set('write');
-                         }, "other")));
+                         }, $T("other"))));
             },
 
@@ -49 +51 @@
                 pm.add(text);
                 return Html.div({}, text,
-                                " or ",
+                                " ",
+                               $T("or"),
+                               " ",
                                 Widget.link(command(function() {
                                     chooser.set('select');
-                                }, "select from list")));
+                                }, $T("select from list"))));
             }
         }));
@@ -83 +87 @@
                         IndicoUtil.createFormFromMap(
                             [
-                                ['Type', selector],
-                                ['File', file],
-                                ['Description', description],
-                                ['Convert to PDF', convert]
+                                [$T('Type'), selector],
+                                [$T('File'), file],
+                                [$T('Description'), description],
+                                [$T('Convert to PDF'), convert]
                             ]),
                         uploadType,
@@ -97 +101 @@
                                              self.form.dom.submit();
                                          }
-                                     }, "Upload"))));
+                                     }, $T("Upload")))));
     },
 
@@ -119 +123 @@
                         IndicoUtil.createFormFromMap(
                             [
-                                ['Type',selector],
-                                ['URL', url],
-                                ['Description', description]
+                                [$T('Type'),selector],
+                                [$T('URL'), url],
+                                [$T('Description'), description]
                             ]),
                         uploadType,
@@ -132 +136 @@
                                              self.form.dom.submit();
                                          }
-                                     }, "Upload"))));
+                                     }, $T("Upload")))));
     },
 
@@ -178 +182 @@
 
     draw: function() {
-        this.tabWidget = new TabWidget([['Upload File', this._drawFileUpload()],
-                                        ['Add Link', this._drawLinkUpload()]],
+        this.tabWidget = new TabWidget([[$T('Upload File'), this._drawFileUpload()],
+                                        [$T('Add Link'), this._drawLinkUpload()]],
                                        400, 200);
 
@@ -197 +201 @@
 //    this.args.materialId = material;
 
-    this.ExclusivePopup("Upload Material",
+    this.ExclusivePopup($T("Upload Material"),
                         function() {
                             self.close();
@@ -238 +242 @@
         var statusSelection = Widget.select(
             $L({
-                0:(self.material.get('protectedOwner')?'Private':'Public')+' (from parent)',
-                1:'Private (by itself)',
-                '-1':'Public (by itself)'
+                0:(self.material.get('protectedOwner')?$T('Private'):$T('Public'))+' '+$T('(from parent)'),
+                1:$T('Private (by itself)'),
+                '-1':$T('Public (by itself)')
             })
         );
@@ -255 +259 @@
         var visibility = Html.select(
             {},
-            Html.option({value: 0},'Visible for unauth. users'),
-            Html.option({value: 1},'Hidden from unauth. users')
+            Html.option({value: 0},$T('Visible for unauth. users')),
+            Html.option({value: 1},$T('Hidden from unauth. users'))
         );
 
@@ -271 +275 @@
             {style:{padding:pixels(2)}},
             Html.div({},
-                     Html.label({}, 'Allowed users'),
+                     Html.label({}, $T('Allowed users')),
                      self.userList.draw()),
             Html.div({style:{marginTop: pixels(4)}},
-                     Html.label({}, 'Visibility: '),
+                     Html.label({}, $T('Visibility: ')),
                      $B(visibility,
                         self.newMaterial.accessor('hidden'))),
             Html.div({},
-                     Html.label({}, 'Access Key: '),
+                     Html.label({}, $T('Access Key: ')),
                      $B(Html.input('password',{}),
                         self.newMaterial.accessor('accessKey')))
@@ -287 +291 @@
             {style: {marginTop: pixels(5)}},
             Html.div({},
-                     Html.label({},"Status: "),
+                     Html.label({},$T("Status: ")),
                      $B(statusSelection,
                         self.newMaterial.accessor('protection'))
@@ -300 +304 @@
             Widget.button(command(function() {
                 self._saveCategory();
-            },'Save')),
+            },$T('Save'))),
             Widget.button(command(function() {
                 self.close();
-            }, 'Cancel'))
+            }, $T('Cancel')))
         ]);
 
@@ -310 +314 @@
 
         var tabControl = new TabWidget([
-            ["Information", Widget.block([titleDiv,descDiv])],
-            ["Access Control" , protectionDiv]], 300,200, 0);
+            [$T("Information"), Widget.block([titleDiv,descDiv])],
+            [$T("Access Control") , protectionDiv]], 300,200, 0);
 
         return this.ExclusivePopup.prototype.draw.call(
@@ -373 +377 @@
         self.newResource = clone(this.resource);
         var name = Html.input('text',{});
-        var nameDiv = Widget.block([Html.label({},"Name: "),name]);
+        var nameDiv = Widget.block([Html.label({},$T("Name: ")),name]);
         var description = Html.textarea({name:'description',style: {width: '200px'}});
-        var descDiv = Widget.block([Widget.block(Html.label({},"Description: ")),description]);
+        var descDiv = Widget.block([Widget.block(Html.label({},$T("Description: "))),description]);
         var url = Html.input('text',{name:'url'});
-        var urlDiv = Widget.block([Html.label({},"URL: "),url]);
+        var urlDiv = Widget.block([Html.label({},$T("URL: ")),url]);
         var buttonDiv = Widget.block([
             Widget.button(command(function() {
                 self._saveResource();
-            }, 'Save')),
+            }, $T('Save'))),
             Widget.button(command(function() {
                 self.close();
-            }, 'Cancel'))
+            }, $T('Cancel')))
         ]);
 
@@ -401 +405 @@
         var statusSelection = Widget.select(
             $L({
-                0:(self.resource.get('protectedOwner')?'Private':'Public')+' (from parent)',
-                1:'Private (by itself)',
-                '-1':'Public (by itself)'
+                0:(self.resource.get('protectedOwner')?$T('Private'):$T('Public'))+' '+$T('(from parent)'),
+                1:$T('Private (by itself)'),
+                '-1':$T('Public (by itself)')
             })
         );
@@ -419 +423 @@
             {style:{padding:pixels(2)}},
             Html.div({},
-                     Html.label({}, 'Allowed users'),
+                     Html.label({}, $T('Allowed users')),
                      self.userList.draw()));
 
@@ -425 +429 @@
             {style: {marginTop: pixels(5)}},
             Html.div({},
-                     Html.label({},"Status: "),
+                     Html.label({},$T("Status: ")),
                      $B(statusSelection,
                         self.newResource.accessor('protection'))), privateInfoDiv);
 
         var tabControl = new TabWidget([
-            ["Information", Widget.block([nameDiv,this.resource.type=='stored'?[]:urlDiv,descDiv])],
-            ["Access Control", protectionDiv]], 300,200, 0);
-        tabControl.options = $L(["Information", "Access Control"]);
-        tabControl.selected.set("Information");
+            [$T("Information"), Widget.block([nameDiv,this.resource.type=='stored'?[]:urlDiv,descDiv])],
+            [$T("Access Control")   , protectionDiv]], 300,200, 0);
+        tabControl.options = $L([$T("Information"), $T("Access Control")]);
+        tabControl.selected.set($T("Information"));
 
         return this.ExclusivePopup.prototype.draw.call(
@@ -507 +511 @@
 var modifyDisabledHelpPopup = function(event) {
     IndicoUI.Widgets.Generic.tooltip(this, event,
-                                     'Modifying this material is currently not possible because it has been already submitted.');
+                                     $T('Modifying this material is currently not possible because it has been already submitted.'));
 };
 
@@ -523 +527 @@
 
         var deleteResource = function() {
-            if (confirm("Are you sure you want to delete "+resource.get('name')+"?")) {
+            if (confirm($T("Are you sure you want to delete")+" "+resource.get('name')+"?")) {
                 var killProgress = IndicoUI.Dialogs.Util.progress($T('Removing...'));
                 jsonRpc(Indico.Urls.JsonRpcService,
@@ -808 +812 @@
                                               }
                                           });
-        }, "Add Material"));
+        }, $T("Add Material")));
 
         return Html.div(
@@ -863 +867 @@
                          self.close();
                          window.location.reload(true);
-                     }, "Close"))));
+                     }, $T("Close")))));
     }
 },
@@ -887 +891 @@
     },
     editMaterial: function(args, material, list) {
-        var dialog = new EditMaterialDialog(args, material, list, "Edit Material");
+        var dialog = new EditMaterialDialog(args, material, list, $T("Edit Material"));
         dialog.execute();
     },
 
     editResource: function(args, material, resource, domItem, appender) {
-        var dialog = new EditResourceDialog(args, material, resource, domItem, appender, "Edit Resource");
+        var dialog = new EditResourceDialog(args, material, resource, domItem, appender, $T("Edit Resource"));
         dialog.execute();
     },
 
     editor: function(confId, sessId, contId, subContId, types, uploadAction, refresh) {
-        var dialog = new MaterialEditorDialog(confId, sessId, contId, subContId, types, uploadAction, "Edit Materials", 400, 300, refresh);
+        var dialog = new MaterialEditorDialog(confId, sessId, contId, subContId, types, uploadAction, $T("Edit Materials"), 400, 300, refresh);
         dialog.open();
     }