Changeset 3328

Timestamp:

Oct 8, 2007, 3:37:33 PM (15 years ago)

Author:

charles

Message:

make the gtk translation files play nicely with autoconf

Location:

trunk

Files:

• Makefile.am (modified) (2 diffs)
• autogen.sh (modified) (2 diffs)
• configure.ac (modified) (5 diffs)
• gtk/Makefile.am (modified) (2 diffs)
• gtk/main.c (modified) (1 diff)
• gtk/transmission.desktop.in (moved) (moved from trunk/gtk/transmission.desktop) (1 diff)
• po (moved) (moved from trunk/gtk/po)
• po/LINGUAS (added)
• po/POTFILES.in (added)
• po/transmission-gtk.pot (deleted)

trunk/Makefile.am

@@ -2 +2 @@
 
 if WITH_GTK
-  GTK_DIR = gtk
+  GTK_DIR = gtk po
 endif
 if HAVE_BEOS
@@ -24 +24 @@
  LICENSE \
  README \
- third-party
+ third-party \
+ intltool-extract.in intltool-merge.in intltool-update.in 

trunk/autogen.sh

@@ -1 +1 @@
 #!/bin/sh
+
+GETTEXTIZE="glib-gettextize"
+$GETTEXTIZE --version < /dev/null > /dev/null 2>&1
+if test $? -ne 0; then
+    GETTEXTIZE=""
+fi
 
 LIBTOOLIZE=libtoolize
@@ -9 +15 @@
 
 autoreconf -fi -I m4
+
+if test "$GETTEXTIZE"; then
+  echo "Creating aclocal.m4 ..."
+  test -r aclocal.m4 || touch aclocal.m4
+  echo "Running $GETTEXTIZE...  Ignore non-fatal messages."
+  echo "no" | $GETTEXTIZE --force --copy
+  echo "Making aclocal.m4 writable ..."
+  test -r aclocal.m4 && chmod u+w aclocal.m4
+  echo "Running intltoolize..."
+  intltoolize --copy --force --automake
+fi
+

trunk/configure.ac

@@ -1 @@
-AC_INIT([Transmission],[0.82+],[http://transmission.m0k.org/trac/newticket])
+AC_INIT([transmission],[0.82+],[http://transmission.m0k.org/trac/newticket])
 PEERID_PREFIX="-TR082Z-"
 USERAGENT_PREFIX="0.82+"
@@ -29 +29 @@
 AC_PROG_RANLIB
 ACX_PTHREAD
-
-dnl AC_PROG_INTLTOOL([0.23],[no-xml])
-GETTEXT_PACKAGE=transmission
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
-ALL_LINGUAS="bg es fi fr it pl ro ru sk sv"
-AM_GLIB_GNU_GETTEXT
-transmissionlocaledir='${prefix}/${DATADIRNAME}/locale'
 
 AC_CHECK_LIB([crypto],[CRYPTO_new_ex_data])
@@ -77 +69 @@
 AC_SUBST(GTK_CFLAGS)
 
+if test "x$use_gtk" = "xyes"; then
+    AC_PROG_INTLTOOL([0.23],[no-xml])
+    GETTEXT_PACKAGE=transmission
+    AC_SUBST(GETTEXT_PACKAGE)
+    AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
+    AM_GLIB_GNU_GETTEXT
+    transmissionlocaledir='${prefix}/${DATADIRNAME}/locale'
+    AC_SUBST(transmissionlocaledir)
+fi
 
 dnl ----------------------------------------------------------------------------
@@ -191 +192 @@
 
 
-
 dnl ----------------------------------------------------------------------------
 dnl
@@ -207 +207 @@
                  macosx/Makefile
                  wx/Makefile
-                 wx/images/Makefile])
+                 wx/images/Makefile
+                 po/Makefile.in])
 
 ac_configure_args="$ac_configure_args --enable-static --disable-shared -q"

trunk/gtk/Makefile.am

@@ -3 +3 @@
     $(LIBEVENT_CPPFLAGS) \
     $(GTK_CFLAGS) \
-    -DLOCALEDIR=\""$(transmissionlocaledir)"\"
+    -DTRANSMISSIONLOCALEDIR=\""$(transmissionlocaledir)"\"
 
 AM_CFLAGS = $(PTHREAD_CFLAGS)
@@ -53 +53 @@
     $(GTK_LIBS) \
     $(PTHREAD_LIBS) -lm
+
+Productivitydir = $(datadir)/applications
+Productivity_DATA = $(DESKTOP_FILES)
+
+icon_DATA = transmission.png
+icondir = $(datadir)/pixmaps

trunk/gtk/main.c

@@ -363 +363 @@
 {
 
-    bindtextdomain( "transmission-gtk", LOCALEDIR );
-    bind_textdomain_codeset( "transmission-gtk", "UTF-8" );
-    textdomain( "transmission-gtk" );
+    bindtextdomain( "transmission", TRANSMISSIONLOCALEDIR );
+    bind_textdomain_codeset( "transmission", "UTF-8" );
+    textdomain( "transmission" );
 
     g_set_application_name( _("Transmission") );

trunk/gtk/transmission.desktop.in

@@ -1 +1 @@
 [Desktop Entry]
 Encoding=UTF-8
-Version=1.0
-Name=Transmission BitTorrent Client
+_Name=Transmission BitTorrent Client
+_Comment=A free, lightweight BitTorrent client with a simple, intuitive interface
+Exec=transmission %F
+Icon=transmission.png
+Terminal=false
+TryExec=transmission
 Type=Application
-Comment=A free, lightweight BitTorrent client with a simple, intuitive interface
-Comment[bg]=СвПбПЎеМ, лек BitTorrent клОеМт с прПст, ОМтуОтОвеМ ОМтерфейс
-Comment[es]=Un cliente libre, ligero de BitTorrent con una interfaz simple e intuitiva
-Comment[fi]=Ilmainen, kevytkÀyttöinen BitTorrent ohjelma jossa on helppokÀyttöinen kÀyttöliittymÀ
-Comment[fr]=Un client BitTorrent léger, libre, avec une interface simple et intuitive
-Comment[it]=Un client BitTorrent libero e leggero con un'interfaccia semplice ed intuitiva
-Comment[pl]=Darmowy, lekki klient BitTorrent z prostym, intuicyjnym interfejscem
-Comment[ro]=Un client BitTorrent liber, neîncărcat, cu o interfaţă simplă şi intuitivă
-Comment[ru]=СвПбПЎМый, легкПвесМый BitTorrent клОеМт с прПстыЌ, ОМтуОтОвМыЌ ОМтерфейсПЌ
-Comment[sv]=En fri, lÀttviktig BitTorrent-klient med ett enkelt och intuitivt grÀnssnitt
-Exec=transmission %F
-TryExec=transmission
-Icon=transmission.png
 MimeType=application/x-bittorrent;
 Categories=Network;FileTransfer;P2P;GTK;