From ad48f1648ba143cab31f124e502a8c8e5e445d95 Mon Sep 17 00:00:00 2001 From: gc Date: Tue, 4 Mar 2008 22:06:52 +0000 Subject: [PATCH] *** empty log message *** --- bin/booh-backend | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/bin/booh-backend b/bin/booh-backend index 0e2c5bb..ef86b69 100755 --- a/bin/booh-backend +++ b/bin/booh-backend @@ -672,16 +672,16 @@ def find_translation_for_file(file, msg) end end -def sub_previous_next_album(file, previous_album, next_album, html) +def sub_previous_next_album(file, previous_album, next_album, html, previous_album_msg, next_album_msg) if previous_album - html.gsub!(/~~previous_album~~/, '' + find_translation_for_file(file, N_('previous album')) + '') + html.gsub!(/~~previous_album~~/, '' + previous_album_msg + '') html.gsub!(/~~ifprevious_album\?~~(.+?)~~fi~~/) { $1 } else html.gsub!(/~~previous_album~~/, '') html.gsub!(/~~ifprevious_album\?~~(.+?)~~fi~~/, '') end if next_album - html.gsub!(/~~next_album~~/, '' + find_translation_for_file(file, N_('next album')) + '') + html.gsub!(/~~next_album~~/, '' + next_album_msg + '') html.gsub!(/~~ifnext_album\?~~(.+?)~~fi~~/) { $1 } else html.gsub!(/~~next_album~~/, '') @@ -1352,13 +1352,17 @@ def walk_source_dir for suffix in [ '', '-nojs' ] for sizeobj in $images_size Dir.glob("#{dest_dir}/thumbnails-#{size2js(sizeobj['name'])}#{suffix}-*.html") do |file| + #- unroll translations, they are costly if rerun for each line of files + rta = find_translation_for_file(file, N_('return to albums')) + pa = find_translation_for_file(file, N_('previous album')) + na = find_translation_for_file(file, N_('next album')) substInFile(file) { |line| - sub_previous_next_album(file, previous_album, next_album, line) + sub_previous_next_album(file, previous_album, next_album, line, pa, na) if dirpresent - line.sub!(/~~return_to_albums~~/, '' + find_translation_for_file(file, N_('return to albums')) + '') + line.sub!(/~~return_to_albums~~/, '' + rta + '') else if parentname == 'dir' - line.sub!(/~~return_to_albums~~/, '' + find_translation_for_file(file, N_('return to albums')) + '') + line.sub!(/~~return_to_albums~~/, '' + rta + '') else line.sub!(/~~return_to_albums~~/, '') end @@ -1368,8 +1372,10 @@ def walk_source_dir end if suffix == '' && xmldir.child_byname_notattr('image', 'deleted') Dir.glob("#{dest_dir}/image-#{size2js(sizeobj['name'])}*.html") do |file| + pa = find_translation_for_file(file, N_('previous album')) + na = find_translation_for_file(file, N_('next album')) substInFile(file) { |line| - sub_previous_next_album(file, previous_album, next_album, line) + sub_previous_next_album(file, previous_album, next_album, line, pa, na) } end end -- 2.30.4