diff --git a/resources/template-functions.json b/resources/template-functions.json index cb329d771c..332ce1ddea 100644 --- a/resources/template-functions.json +++ b/resources/template-functions.json @@ -12,7 +12,7 @@ "re": "def evaluate(self, formatter, kwargs, mi, locals, val, pattern, replacement):\n return re.sub(pattern, replacement, val)\n", "add": "def evaluate(self, formatter, kwargs, mi, locals, x, y):\n x = float(x if x else 0)\n y = float(y if y else 0)\n return unicode(x + y)\n", "lookup": "def evaluate(self, formatter, kwargs, mi, locals, val, *args):\n if len(args) == 2: # here for backwards compatibility\n if val:\n return formatter.vformat('{'+args[0].strip()+'}', [], kwargs)\n else:\n return formatter.vformat('{'+args[1].strip()+'}', [], kwargs)\n if (len(args) % 2) != 1:\n raise ValueError(_('lookup requires either 2 or an odd number of arguments'))\n i = 0\n while i < len(args):\n if i + 1 >= len(args):\n return formatter.vformat('{' + args[i].strip() + '}', [], kwargs)\n if re.search(args[i], val):\n return formatter.vformat('{'+args[i+1].strip() + '}', [], kwargs)\n i += 2\n", - "template": "def evaluate(self, formatter, kwargs, mi, locals, template):\n template = template.replace('[[', '{').replace(']]', '}')\n return formatter.safe_format(template, kwargs, 'TEMPLATE', mi)\n", + "template": "def evaluate(self, formatter, kwargs, mi, locals, template):\n template = template.replace('[[', '{').replace(']]', '}')\n return formatter.__class__().safe_format(template, kwargs, 'TEMPLATE', mi)\n", "print": "def evaluate(self, formatter, kwargs, mi, locals, *args):\n print args\n return None\n", "titlecase": "def evaluate(self, formatter, kwargs, mi, locals, val):\n return titlecase(val)\n", "test": "def evaluate(self, formatter, kwargs, mi, locals, val, value_if_set, value_not_set):\n if val:\n return value_if_set\n else:\n return value_not_set\n", diff --git a/src/calibre/translations/calibre.pot b/src/calibre/translations/calibre.pot index f2f51c440a..4b74a68108 100644 --- a/src/calibre/translations/calibre.pot +++ b/src/calibre/translations/calibre.pot @@ -4,9 +4,9 @@ # msgid "" msgstr "" -"Project-Id-Version: calibre 0.7.43\n" -"POT-Creation-Date: 2011-02-03 22:52+MST\n" -"PO-Revision-Date: 2011-02-03 22:52+MST\n" +"Project-Id-Version: calibre 0.7.44\n" +"POT-Creation-Date: 2011-02-04 11:04+MST\n" +"PO-Revision-Date: 2011-02-04 11:04+MST\n" "Last-Translator: Automatically generated\n" "Language-Team: LANGUAGE\n" "MIME-Version: 1.0\n" @@ -10663,11 +10663,11 @@ msgstr "" msgid "The saved search name %s is already used." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1313 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1321 msgid "Find item in tag browser" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1316 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1324 msgid "" "Search for items. This is a \"contains\" search; items containing the\n" "text anywhere in the name will be found. You can limit the search\n" @@ -10677,59 +10677,59 @@ msgid "" "containing the text \"foo\"" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1325 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1333 msgid "ALT+f" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1329 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1337 msgid "F&ind" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1330 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1338 msgid "Find the first/next matching item" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1337 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1345 msgid "Collapse all categories" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1358 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1366 msgid "No More Matches.

Click Find again to go to first match" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1371 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379 msgid "Sort by name" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1371 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379 msgid "Sort by popularity" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1372 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380 msgid "Sort by average rating" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1375 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1383 msgid "Set the sort order for entries in the Tag Browser" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1381 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1389 msgid "Match all" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1381 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1389 msgid "Match any" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394 msgid "When selecting multiple entries in the Tag Browser match any or all of them" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1390 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1398 msgid "Manage &user categories" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1401 msgid "Add your own categories to the Tag Browser" msgstr "" @@ -11905,7 +11905,7 @@ msgstr "" msgid "No books available to include in catalog" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/catalog.py:5012 +#: /home/kovid/work/calibre/src/calibre/library/catalog.py:5024 msgid "" "\n" "*** Adding 'By Authors' Section required for MOBI output ***"