gnome-specimen r56 - in branches/import-from-bzr: . glade po specimen src

[wbolster svn gnome org]

Author: wbolster
Date: Tue Jun 17 18:52:47 2008
New Revision: 56
URL: http://svn.gnome.org/viewvc/gnome-specimen?rev=56&view=rev

Log:
* Mark strings for translation
* Some more auto-fu changes


Added:
   branches/import-from-bzr/specimen/
      - copied from r55, /branches/import-from-bzr/src/
   branches/import-from-bzr/specimen/__init__.py
Removed:
   branches/import-from-bzr/glade/
   branches/import-from-bzr/src/
Modified:
   branches/import-from-bzr/   (props changed)
   branches/import-from-bzr/Makefile.am
   branches/import-from-bzr/autogen.sh
   branches/import-from-bzr/configure.ac
   branches/import-from-bzr/po/POTFILES.in
   branches/import-from-bzr/po/nl.po
   branches/import-from-bzr/specimen/Makefile.am
   branches/import-from-bzr/specimen/gnome-specimen.in
   branches/import-from-bzr/specimen/specimenwindow.py

Modified: branches/import-from-bzr/Makefile.am
==============================================================================
--- branches/import-from-bzr/Makefile.am	(original)
+++ branches/import-from-bzr/Makefile.am	Tue Jun 17 18:52:47 2008
@@ -1,7 +1,7 @@
 
 .PHONY: ChangeLog
 
-SUBDIRS = data po src
+SUBDIRS = data po specimen
 
 ChangeLog:
 	bzr log --forward > $<

Modified: branches/import-from-bzr/autogen.sh
==============================================================================
--- branches/import-from-bzr/autogen.sh	(original)
+++ branches/import-from-bzr/autogen.sh	Tue Jun 17 18:52:47 2008
@@ -9,7 +9,7 @@
 REQUIRED_AUTOMAKE_VERSION=1.7.2
 
 (test -f $srcdir/configure.ac \
-  && test -f $srcdir/src/specimenwindow.py) || {
+  && test -f $srcdir/specimen/specimenwindow.py) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level $PKG_NAME directory"
     exit 1

Modified: branches/import-from-bzr/configure.ac
==============================================================================
--- branches/import-from-bzr/configure.ac	(original)
+++ branches/import-from-bzr/configure.ac	Tue Jun 17 18:52:47 2008
@@ -1,35 +1,35 @@
-AC_PREREQ(2.53)
-
+dnl  initialization
 AC_INIT([gnome-specimen], [0.1])
-AC_CONFIG_SRCDIR(specimenwindow.py)
+AC_CONFIG_SRCDIR(specimen/specimenwindow.py)
 AM_INIT_AUTOMAKE([1.7])
 AM_MAINTAINER_MODE
 
-dnl i18n
+dnl  i18n
 GETTEXT_PACKAGE=gnome-specimen
 AC_SUBST([GETTEXT_PACKAGE])
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE", [Gettext package])
 AM_GLIB_GNU_GETTEXT
 IT_PROG_INTLTOOL([0.35.0])
 
-dnl dependencies
+dnl  dependencies
 AM_PATH_PYTHON
 PKG_CHECK_MODULES(pygtk, pygtk-2.0 >= 2.6.0)
 
-# fixup the prefix expansion
+dnl  extra expansions
+EXEC_PREFIX_TMP="$exec_prefix"
+EXPANDED_EXEC_PREFIX=`eval echo $EXEC_PREFIX_TMP`
+AC_SUBST(EXPANDED_EXEC_PREFIX)
 EXEC_PREFIX_TMP="$exec_prefix"
 EXPANDED_EXEC_PREFIX=`eval echo $EXEC_PREFIX_TMP`
 AC_SUBST(EXPANDED_EXEC_PREFIX)
 
-
+dnl  create output
 AC_CONFIG_FILES([
-Makefile
-src/gnome-specimen
+data/gnome-specimen.desktop.in
 data/Makefile
+Makefile
 po/Makefile.in
-src/Makefile
-])
-
-AC_OUTPUT([
-data/gnome-specimen.desktop.in
+specimen/gnome-specimen
+specimen/Makefile
 ])
+AC_OUTPUT

Modified: branches/import-from-bzr/po/POTFILES.in
==============================================================================
--- branches/import-from-bzr/po/POTFILES.in	(original)
+++ branches/import-from-bzr/po/POTFILES.in	Tue Jun 17 18:52:47 2008
@@ -1,3 +1,5 @@
 # List of source files containing translatable strings.
 # Please keep this list in alphabetic order.
-src/specimenwindow.py
+data/gnome-specimen.desktop.in.in
+data/gnome-specimen.glade
+specimen/specimenwindow.py

Modified: branches/import-from-bzr/specimen/Makefile.am
==============================================================================
--- /branches/import-from-bzr/src/Makefile.am	(original)
+++ branches/import-from-bzr/specimen/Makefile.am	Tue Jun 17 18:52:47 2008
@@ -7,6 +7,11 @@
 CLEANFILES = \
 	gnome-specimen
 
+appdir = $(pyexecdir)/specimen
+app_PYTHON = \
+	__init__.py \
+	specimenwindow.py
+
 #gnome-specimen: gnome-specimen.in Makefile
 #	sed -e s!\ pyexecdir\@! pyexecdir@! -e s!\ PYTHON\@! PYTHON@! < $< > $@
 #	chmod a+x $@

Added: branches/import-from-bzr/specimen/__init__.py
==============================================================================

Modified: branches/import-from-bzr/specimen/gnome-specimen.in
==============================================================================
--- /branches/import-from-bzr/src/gnome-specimen.in	(original)
+++ branches/import-from-bzr/specimen/gnome-specimen.in	Tue Jun 17 18:52:47 2008
@@ -17,18 +17,20 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA+
 
+import sys
+import os.path
+
+if not "@pyexecdir@" in sys.path:
+        sys.path.insert (0, "@pyexecdir@")
+
 PACKAGE   = "@PACKAGE_NAME@"
 VERSION   = "@PACKAGE_VERSION@"
 
-LOCALEDIR = "@LOCALEDIR@"
-DATADIR   = "@DATADIR@"
-GLADEDIR  = "@GLADEDIR@"
+DATADIR   = "@DATADIRNAME@"
+LOCALEDIR = os.path.join(DATADIR, 'locale')
+GLADEDIR  = os.path.join(DATADIR, 'glade')
 
 
-import sys
-if not "@pyexecdir@" in sys.path:
-        sys.path.insert (0, "@pyexecdir@")
-
 import gettext
 import locale
 

Modified: branches/import-from-bzr/specimen/specimenwindow.py
==============================================================================
--- /branches/import-from-bzr/src/specimenwindow.py	(original)
+++ branches/import-from-bzr/specimen/specimenwindow.py	Tue Jun 17 18:52:47 2008
@@ -5,13 +5,14 @@
 import gtk.glade
 import pango
 
+from gettext import gettext as _
 
 class SpecimenWindow:
 
     families = []
 
     preview_size = 12
-    preview_text = 'Pack my box with five dozen liquor jugs.'
+    preview_text = _('Pack my box with five dozen liquor jugs.')
     preview_fgcolor = gtk.gdk.color_parse('black')
     preview_bgcolor = gtk.gdk.color_parse('white')
 
@@ -55,6 +56,7 @@
         import os.path
         glade_filename = os.path.join(
             os.path.dirname(os.path.realpath(__file__)),
+            '../../../../share/gnome-specimen/'
             'glade',
             'gnome-specimen.glade')
         tree = gtk.glade.XML(glade_filename)
@@ -584,8 +586,8 @@
             self.about_dialog
 
         except (AttributeError):
-            name = 'GNOME Specimen'
-            comments = 'A font preview application for GNOME'
+            name = _('GNOME Specimen')
+            comments = _('Preview en compare fonts')
             copyright = u'Copyright \u00A9 2006 Wouter Bolsterlee'
             authors = ['Wouter Bolsterlee <wbolster gnome org>']