Menu
▾
▴
[Collective-checkins] r225789 - in collective.amberjack.core/trunk/collective/amberjack/core: javascript locales locales/es/LC_MESSAGES locales/fr/LC_MESSAGES locales/no/LC_MESSAGES locales/pt-br/LC_MESSAGES locales/sl/LC_MESSAGES profiles/default skins/collective_amberjack_javascript
|
From: Sylvain B. <svn...@pl...> - 2010-10-31 16:29:37
|
Author: sylvainb
Date: Sun Oct 31 16:27:58 2010
New Revision: 225789
Modified:
collective.amberjack.core/trunk/collective/amberjack/core/javascript/defaults.py
collective.amberjack.core/trunk/collective/amberjack/core/locales/collective.amberjack.core.pot
collective.amberjack.core/trunk/collective/amberjack/core/locales/es/LC_MESSAGES/collective.amberjack.core.po
collective.amberjack.core/trunk/collective/amberjack/core/locales/fr/LC_MESSAGES/collective.amberjack.core.po
collective.amberjack.core/trunk/collective/amberjack/core/locales/no/LC_MESSAGES/collective.amberjack.core.mo
collective.amberjack.core/trunk/collective/amberjack/core/locales/no/LC_MESSAGES/collective.amberjack.core.po
collective.amberjack.core/trunk/collective/amberjack/core/locales/pt-br/LC_MESSAGES/collective.amberjack.core.po
collective.amberjack.core/trunk/collective/amberjack/core/locales/sl/LC_MESSAGES/collective.amberjack.core.po
collective.amberjack.core/trunk/collective/amberjack/core/profiles/default/jsregistry.xml
collective.amberjack.core/trunk/collective/amberjack/core/skins/collective_amberjack_javascript/amberjack.js
collective.amberjack.core/trunk/collective/amberjack/core/skins/collective_amberjack_javascript/amberjackPlone.js
Log:
amberjackDefaults.js must not be cacheable because of some messages depend on the user's language - Allow translations for the alert message when the user clics on other links
Modified: collective.amberjack.core/trunk/collective/amberjack/core/javascript/defaults.py
==============================================================================
--- collective.amberjack.core/trunk/collective/amberjack/core/javascript/defaults.py (original)
+++ collective.amberjack.core/trunk/collective/amberjack/core/javascript/defaults.py Sun Oct 31 16:27:58 2010
@@ -13,14 +13,18 @@
def __call__(self, context, request):
constants = """
if (AmberjackPlone){
- AmberjackPlone.aj_plone_consts['Error'] = '%s';
- AmberjackPlone.aj_plone_consts['ErrorValidation'] = '%s';
- AmberjackPlone.aj_plone_consts['BrowseFile'] = '%s';
+ AmberjackPlone.aj_plone_consts['Error'] = "%s";
+ AmberjackPlone.aj_plone_consts['ErrorValidation'] = "%s";
+ AmberjackPlone.aj_plone_consts['BrowseFile'] = "%s";
+ AmberjackPlone.aj_plone_consts['AlertDefaultTitle'] = "%s";
+ AmberjackPlone.aj_plone_consts['AlertDisableLinksMessage'] = "%s";
}
- """ % (PMF(u'Error'),
- PMF(u'Please correct the indicated errors.'),
- _(u'Please select a file.'),
+ """ % (translate(PMF(u'Error'), context=self.request),
+ translate(PMF(u'Please correct the indicated errors.'), context=self.request),
+ translate(_(u'Please select a file.'), context=self.request),
+ translate(_(u'Amberjack alert'), context=self.request),
+ translate(_(u"You cannot click on other links, please use the console's exit button."), context=self.request)
)
rootTool = getUtility(ITour, 'collective.amberjack.core.toursroot')
url = rootTool.getToursRoot(getSite(),context)
@@ -37,5 +41,5 @@
}
""" % (portal_url,
url,
- translate(_('separator-between-steps', default=u"of"),context=self.request),
+ translate(_('separator-between-steps', default=u"of"), context=self.request),
constants)
\ No newline at end of file
Modified: collective.amberjack.core/trunk/collective/amberjack/core/locales/collective.amberjack.core.pot
==============================================================================
--- collective.amberjack.core/trunk/collective/amberjack/core/locales/collective.amberjack.core.pot (original)
+++ collective.amberjack.core/trunk/collective/amberjack/core/locales/collective.amberjack.core.pot Sun Oct 31 16:27:58 2010
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-10-31 12:25+0000\n"
+"POT-Creation-Date: 2010-10-31 16:14+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -21,6 +21,10 @@
msgid "Amberjack Setup"
msgstr ""
+#: ../javascript/defaults.py:26
+msgid "Amberjack alert"
+msgstr ""
+
#: ../interfaces.py:39
msgid "Choose archive file"
msgstr ""
@@ -41,7 +45,7 @@
msgid "Please remove the [${path}] object to start the tour."
msgstr ""
-#: ../javascript/defaults.py:23
+#: ../javascript/defaults.py:25
msgid "Please select a file."
msgstr ""
@@ -61,6 +65,10 @@
msgid "Use Sandbox"
msgstr ""
+#: ../javascript/defaults.py:27
+msgid "You cannot click on other links, please use the console's exit button."
+msgstr ""
+
#: ../validators.py:31
msgid "You have to be ${role} to execute this step."
msgstr ""
@@ -79,7 +87,7 @@
msgstr ""
#. Default: "of"
-#: ../javascript/defaults.py:40
+#: ../javascript/defaults.py:44
msgid "separator-between-steps"
msgstr ""
Modified: collective.amberjack.core/trunk/collective/amberjack/core/locales/es/LC_MESSAGES/collective.amberjack.core.po
==============================================================================
--- collective.amberjack.core/trunk/collective/amberjack/core/locales/es/LC_MESSAGES/collective.amberjack.core.po (original)
+++ collective.amberjack.core/trunk/collective/amberjack/core/locales/es/LC_MESSAGES/collective.amberjack.core.po Sun Oct 31 16:27:58 2010
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: collective.amberjack.core\n"
-"POT-Creation-Date: 2010-10-31 12:25+0000\n"
+"POT-Creation-Date: 2010-10-31 16:14+0000\n"
"PO-Revision-Date: 2009-10-29 21:40-0400\n"
"Last-Translator: Leonardo Caballero <leo...@gm...>\n"
"Language-Team: Spanish <plo...@li...>\n"
@@ -25,6 +25,10 @@
msgid "Amberjack Setup"
msgstr ""
+#: ../javascript/defaults.py:26
+msgid "Amberjack alert"
+msgstr ""
+
#: ../interfaces.py:39
msgid "Choose archive file"
msgstr ""
@@ -45,7 +49,7 @@
msgid "Please remove the [${path}] object to start the tour."
msgstr ""
-#: ../javascript/defaults.py:23
+#: ../javascript/defaults.py:25
msgid "Please select a file."
msgstr "Por favor, seleccione un archivo."
@@ -65,6 +69,10 @@
msgid "Use Sandbox"
msgstr ""
+#: ../javascript/defaults.py:27
+msgid "You cannot click on other links, please use the console's exit button."
+msgstr ""
+
#: ../validators.py:31
msgid "You have to be ${role} to execute this step."
msgstr ""
@@ -83,7 +91,7 @@
msgstr "Pra visita guiada:"
#. Default: "of"
-#: ../javascript/defaults.py:40
+#: ../javascript/defaults.py:44
msgid "separator-between-steps"
msgstr "de"
Modified: collective.amberjack.core/trunk/collective/amberjack/core/locales/fr/LC_MESSAGES/collective.amberjack.core.po
==============================================================================
--- collective.amberjack.core/trunk/collective/amberjack/core/locales/fr/LC_MESSAGES/collective.amberjack.core.po (original)
+++ collective.amberjack.core/trunk/collective/amberjack/core/locales/fr/LC_MESSAGES/collective.amberjack.core.po Sun Oct 31 16:27:58 2010
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: collective.amberjack.core\n"
-"POT-Creation-Date: 2010-10-31 12:25+0000\n"
+"POT-Creation-Date: 2010-10-31 16:14+0000\n"
"PO-Revision-Date: 2009-08-24 23:27+0100\n"
"Last-Translator: Vincent Fretin <vin...@gm...>\n"
"Language-Team: French\n"
@@ -21,6 +21,10 @@
msgid "Amberjack Setup"
msgstr "Paramètres d'Amberjack"
+#: ../javascript/defaults.py:26
+msgid "Amberjack alert"
+msgstr "Alerte Amberjack"
+
#: ../interfaces.py:39
msgid "Choose archive file"
msgstr "A partir d'un fichier d'archive"
@@ -41,7 +45,7 @@
msgid "Please remove the [${path}] object to start the tour."
msgstr "Il vous faut supprimer l'objet [${path}] avant de pouvoir commencer la visite guidée."
-#: ../javascript/defaults.py:23
+#: ../javascript/defaults.py:25
msgid "Please select a file."
msgstr "Veuillez sélectionner un fichier."
@@ -61,6 +65,10 @@
msgid "Use Sandbox"
msgstr "Utiliser le bac à sable"
+#: ../javascript/defaults.py:27
+msgid "You cannot click on other links, please use the console's exit button."
+msgstr "Vous ne pouvez pas cliquer sur d'autre liens, merci d'utiliser le bouton de fermeture pour mettre fin à la visite guidée."
+
#: ../validators.py:31
msgid "You have to be ${role} to execute this step."
msgstr "Vous devez avoir le rôle ${role} pour pouvoir exécuter cette étape."
@@ -79,7 +87,7 @@
msgstr "Prochaine visite guidée :"
#. Default: "of"
-#: ../javascript/defaults.py:40
+#: ../javascript/defaults.py:44
msgid "separator-between-steps"
msgstr "sur"
Modified: collective.amberjack.core/trunk/collective/amberjack/core/locales/no/LC_MESSAGES/collective.amberjack.core.mo
==============================================================================
Binary files. No diff available.
Modified: collective.amberjack.core/trunk/collective/amberjack/core/locales/no/LC_MESSAGES/collective.amberjack.core.po
==============================================================================
--- collective.amberjack.core/trunk/collective/amberjack/core/locales/no/LC_MESSAGES/collective.amberjack.core.po (original)
+++ collective.amberjack.core/trunk/collective/amberjack/core/locales/no/LC_MESSAGES/collective.amberjack.core.po Sun Oct 31 16:27:58 2010
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: amberjack\n"
-"POT-Creation-Date: 2010-10-31 12:25+0000\n"
+"POT-Creation-Date: 2010-10-31 16:14+0000\n"
"PO-Revision-Date: 2010-08-05 17:44+0100\n"
"Last-Translator: Espen Moe-Nilssen <es...@me...>\n"
"Language-Team: Norge <es...@me...>\n"
@@ -23,6 +23,10 @@
msgid "Amberjack Setup"
msgstr ""
+#: ../javascript/defaults.py:26
+msgid "Amberjack alert"
+msgstr ""
+
#: ../interfaces.py:39
msgid "Choose archive file"
msgstr ""
@@ -43,7 +47,7 @@
msgid "Please remove the [${path}] object to start the tour."
msgstr ""
-#: ../javascript/defaults.py:23
+#: ../javascript/defaults.py:25
msgid "Please select a file."
msgstr "Vennligst velg en fil."
@@ -63,6 +67,10 @@
msgid "Use Sandbox"
msgstr ""
+#: ../javascript/defaults.py:27
+msgid "You cannot click on other links, please use the console's exit button."
+msgstr ""
+
#: ../validators.py:31
msgid "You have to be ${role} to execute this step."
msgstr ""
@@ -81,7 +89,7 @@
msgstr "Neste tur."
#. Default: "of"
-#: ../javascript/defaults.py:40
+#: ../javascript/defaults.py:44
msgid "separator-between-steps"
msgstr "til"
Modified: collective.amberjack.core/trunk/collective/amberjack/core/locales/pt-br/LC_MESSAGES/collective.amberjack.core.po
==============================================================================
--- collective.amberjack.core/trunk/collective/amberjack/core/locales/pt-br/LC_MESSAGES/collective.amberjack.core.po (original)
+++ collective.amberjack.core/trunk/collective/amberjack/core/locales/pt-br/LC_MESSAGES/collective.amberjack.core.po Sun Oct 31 16:27:58 2010
@@ -3,7 +3,7 @@
msgid ""
msgstr ""
"Project-Id-Version: collective.amberjack.core\n"
-"POT-Creation-Date: 2010-10-31 12:25+0000\n"
+"POT-Creation-Date: 2010-10-31 16:14+0000\n"
"PO-Revision-Date: 2009-11-26 15:15-0300\n"
"Last-Translator: Thiago Tamosauskas <th...@si...>\n"
"Language-Team: Portuguese\n"
@@ -21,6 +21,10 @@
msgid "Amberjack Setup"
msgstr ""
+#: ../javascript/defaults.py:26
+msgid "Amberjack alert"
+msgstr ""
+
#: ../interfaces.py:39
msgid "Choose archive file"
msgstr ""
@@ -41,7 +45,7 @@
msgid "Please remove the [${path}] object to start the tour."
msgstr ""
-#: ../javascript/defaults.py:23
+#: ../javascript/defaults.py:25
msgid "Please select a file."
msgstr "Por favor selecione um arquivo."
@@ -61,6 +65,10 @@
msgid "Use Sandbox"
msgstr ""
+#: ../javascript/defaults.py:27
+msgid "You cannot click on other links, please use the console's exit button."
+msgstr ""
+
#: ../validators.py:31
msgid "You have to be ${role} to execute this step."
msgstr ""
@@ -79,7 +87,7 @@
msgstr "Próximo Tutorial"
#. Default: "of"
-#: ../javascript/defaults.py:40
+#: ../javascript/defaults.py:44
msgid "separator-between-steps"
msgstr "de"
Modified: collective.amberjack.core/trunk/collective/amberjack/core/locales/sl/LC_MESSAGES/collective.amberjack.core.po
==============================================================================
--- collective.amberjack.core/trunk/collective/amberjack/core/locales/sl/LC_MESSAGES/collective.amberjack.core.po (original)
+++ collective.amberjack.core/trunk/collective/amberjack/core/locales/sl/LC_MESSAGES/collective.amberjack.core.po Sun Oct 31 16:27:58 2010
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: amberjack\n"
-"POT-Creation-Date: 2010-10-31 12:25+0000\n"
+"POT-Creation-Date: 2010-10-31 16:14+0000\n"
"PO-Revision-Date: 2009-10-31 11:49+0100\n"
"Last-Translator: Domen Kožar <do...@de...>\n"
"Language-Team: SLOVENIAN <LL...@li...>\n"
@@ -23,6 +23,10 @@
msgid "Amberjack Setup"
msgstr ""
+#: ../javascript/defaults.py:26
+msgid "Amberjack alert"
+msgstr ""
+
#: ../interfaces.py:39
msgid "Choose archive file"
msgstr ""
@@ -43,7 +47,7 @@
msgid "Please remove the [${path}] object to start the tour."
msgstr ""
-#: ../javascript/defaults.py:23
+#: ../javascript/defaults.py:25
msgid "Please select a file."
msgstr "Izberite datoteko."
@@ -63,6 +67,10 @@
msgid "Use Sandbox"
msgstr ""
+#: ../javascript/defaults.py:27
+msgid "You cannot click on other links, please use the console's exit button."
+msgstr ""
+
#: ../validators.py:31
msgid "You have to be ${role} to execute this step."
msgstr ""
@@ -81,7 +89,7 @@
msgstr "Nasledni vodič:"
#. Default: "of"
-#: ../javascript/defaults.py:40
+#: ../javascript/defaults.py:44
msgid "separator-between-steps"
msgstr "od"
Modified: collective.amberjack.core/trunk/collective/amberjack/core/profiles/default/jsregistry.xml
==============================================================================
--- collective.amberjack.core/trunk/collective/amberjack/core/profiles/default/jsregistry.xml (original)
+++ collective.amberjack.core/trunk/collective/amberjack/core/profiles/default/jsregistry.xml Sun Oct 31 16:27:58 2010
@@ -9,7 +9,7 @@
<javascript
id="amberjackDefaults.js"
- cacheable="True" compression="safe" cookable="True"
+ cacheable="False" compression="safe" cookable="True"
enabled="True" expression="" inline="False" />
<javascript
Modified: collective.amberjack.core/trunk/collective/amberjack/core/skins/collective_amberjack_javascript/amberjack.js
==============================================================================
--- collective.amberjack.core/trunk/collective/amberjack/core/skins/collective_amberjack_javascript/amberjack.js (original)
+++ collective.amberjack.core/trunk/collective/amberjack/core/skins/collective_amberjack_javascript/amberjack.js Sun Oct 31 16:27:58 2010
@@ -93,7 +93,7 @@
alert: function (str,title) {
if (title === undefined)
- title = 'Amberjack alert';
+ title = AmberjackPlone.aj_plone_consts['AlertDefaultTitle'];
if (jq.fn.dialog)
jq('<div id="ajMessage">'+str+'<div>').dialog({ modal: true, title: title, zIndex: 500000 });
else
Modified: collective.amberjack.core/trunk/collective/amberjack/core/skins/collective_amberjack_javascript/amberjackPlone.js
==============================================================================
--- collective.amberjack.core/trunk/collective/amberjack/core/skins/collective_amberjack_javascript/amberjackPlone.js (original)
+++ collective.amberjack.core/trunk/collective/amberjack/core/skins/collective_amberjack_javascript/amberjackPlone.js Sun Oct 31 16:27:58 2010
@@ -509,7 +509,7 @@
var notAj = jq("a").not(".ajHighlight,.ajedElement,[id^='aj'],[class^='aj']");
//NOTE: we assume that there are no other 'ajXXX' ids
notAj.click(function(){
- AmberjackBase.alert("You cannot click on other links, please use the console's exit button.");
+ AmberjackBase.alert(AmberjackPlone.aj_plone_consts['AlertDisableLinksMessage']);
return false;
});
notAj.addClass("aj_link_inactive");
|