merge lp:~shlomister/gfxboot-theme-ubuntu/hebrew-fix

Makefile

@@ -21,8 +21,10 @@ INCLUDES     = $(wildcard *.inc)
 # Dzongkha and Mongolian, which ought to be rendered vertically.
 # gfxboot has no bidirectional text support yet
 # (https://bugs.launchpad.net/ubuntu/+source/gfxboot/+bug/212491) so
-# right-to-left languages (Arabic and Hebrew) won't work.
-TRANSLATIONS = $(addsuffix .tr,en $(filter-out ar bn dz gu he hi km ml mn ne pa ta th, $(notdir $(basename $(wildcard po/*.po)))))
+# right-to-left languages (Arabic) won't work. This can be worked-around
+# by displaying RTL text in visual format (which works well for Hebrew and should
+# be considered for use in other languages where applicable)
+TRANSLATIONS = $(addsuffix .tr,en $(filter-out ar bn dz gu hi km ml mn ne pa ta th, $(notdir $(basename $(wildcard po/*.po)))))
 
 DEFAULT_LANG =
 

debian/changelog

@@ -1,8 +1,12 @@
 gfxboot-theme-ubuntu (0.9.1) UNRELEASED; urgency=low
 
+  [ Colin Watson ]
   * Remove "Safe graphics mode" message, which is no longer used.
   * Add nomodeset to "Other options" menu.
 
+  [ Shlomi Loubaton ]
+  * Added back Hebrew support by using visual text (LP: #212491)
+
  -- Colin Watson <cjwatson@ubuntu.com>  Fri, 12 Feb 2010 13:11:08 +0000
 
 gfxboot-theme-ubuntu (0.9.0) lucid; urgency=low

debian/control

@@ -2,7 +2,7 @@ Source: gfxboot-theme-ubuntu
 Section: utils
 Priority: optional
 Maintainer: Colin Watson <cjwatson@ubuntu.com>
-Build-Depends: debhelper (>= 7.0.0), gfxboot (>= 3.3.28), cpio
+Build-Depends: debhelper (>= 7.0.0), gfxboot (>= 3.3.28), cpio, libfribidi0
 Standards-Version: 3.6.2
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/gfxboot-theme-ubuntu/mainline
 

po/bin/po2txt

@@ -5,6 +5,7 @@
 # Note: en.po ist treated specially!
 
 use Getopt::Long;
+use IPC::Open2;
 
 sub read_texts;
 sub join_msg;
@@ -106,6 +107,15 @@ sub read_texts
     $txt =~ s/\\"/"/g;
     $txt =~ s/\\\\/\\/g;
     $txt =~ s/\\n/\n/g;
+    if($lang eq "he")
+    {
+      my $bidi_pid = open2(\*BIDI_OUT, \*BIDI_IN, 'fribidi', '--nopad', '--nobreak');
+      print BIDI_IN $txt;
+      close BIDI_IN;
+      { local $/ = undef; $txt = <BIDI_OUT>; }
+      $txt =~ s/(.)%/%$1/g;
+      waitpid $bidi_pid, 0;
+    }
     print "$txt\x00"
   }