changeset 186:a2a5dedfeb1d

merge
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Thu, 17 Jul 2008 23:29:38 +0200
parents 7e23f320ce08 (current diff) 18202e3eb721 (diff)
children a0c61c78446e
files data/plugin/action/arnica_slides.py data/plugin/parser/text_x_arnica.py
diffstat 2 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/data/plugin/action/arnica_slides.py	Thu Jul 17 23:28:47 2008 +0200
+++ b/data/plugin/action/arnica_slides.py	Thu Jul 17 23:29:38 2008 +0200
@@ -210,7 +210,7 @@
     link_to_image = AttachFile.getAttachUrl(pagename, original_images[idx], request)
 
     image_url = "%s%s" % (url, images[idx])
-    option_webnail = option_list(image_url, pagename, images, original_images, alias, request, image_for_webnail)
+    option_webnail = option_list(image_url, pagename, images, original_images, request, image_for_webnail)
     inner_table_style = ' style="border-style:none; margin:10px;"'
     this_webnail_list = "".join(["%s%s|" % (url, name) for name in images])
 
@@ -266,14 +266,13 @@
     return html
 
 
-def option_list(this_image, pagename, text, original_images, alias, request, image_for_webnail):
+def option_list(this_image, pagename, text, original_images, request, image_for_webnail):
     """ generates the pulldown option list
 
     @param this_image: selected image on top
     @param pagename: pagename of attachments
     @param text: list of filenames
     @param original_images: list of original image attachment names (thumbnails and webnails are derived from it)
-    @param alias: text alias for filename
     @param request: request object
     @param image_for_webnail: True: use attachments, False: use cache
     """
--- a/data/plugin/parser/text_x_arnica.py	Thu Jul 17 23:28:47 2008 +0200
+++ b/data/plugin/parser/text_x_arnica.py	Thu Jul 17 23:29:38 2008 +0200
@@ -629,9 +629,9 @@
                     self.webnail_image = self.high_resolution_image
                 text = self.html_arrange_thumbnails(i)
             except ValueError:
-                text = self.formatter.text(_('You can't use as album image: '
-                         '"%(album_image)s" because it does not exist or it is not listed '
-                         'in your item list!') % {"album_image": album_image, })
+                text = self.formatter.text(_("""You can't use as album image: 
+"%(album_image)s" because it does not exist or it is not listed 
+in your item list!""") % {"album_image": album_image, })
 
             result.append(''.join(text))