diff --git a/configure.in b/configure.in index 72a13e7dbc..47c2f26af2 100644 --- a/configure.in +++ b/configure.in @@ -32,7 +32,7 @@ GNUCASH_VERSION_STRING=AC_PACKAGE_VERSION GNUCASH_MAJOR_VERSION=`echo $GNUCASH_VERSION_STRING | [ sed -e 's/^\([^\.]*\)\.\([^.]*\)\.\(.*\)$/\1/' ]` GNUCASH_MINOR_VERSION=`echo $GNUCASH_VERSION_STRING | [ sed -e 's/^\([^\.]*\)\.\([^.]*\)\.\(.*\)$/\2/' ]` GNUCASH_MICRO_VERSION=`echo $GNUCASH_VERSION_STRING | [ sed -e 's/^\([^\.]*\)\.\([^.]*\)\.\(.*\)$/\3/' ]` -GNUCASH_LATEST_STABLE_VERSION="2.2.9" +GNUCASH_LATEST_STABLE_SERIES=$GNUCASH_MAJOR_VERSION.$(($GNUCASH_MINOR_VERSION-($GNUCASH_MINOR_VERSION%2))) # save any user/environment optimization flags before we muck with them in # --enable-debug: @@ -67,7 +67,7 @@ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY) AC_SUBST(GNUCASH_MAJOR_VERSION) AC_SUBST(GNUCASH_MINOR_VERSION) AC_SUBST(GNUCASH_MICRO_VERSION) -AC_SUBST(GNUCASH_LATEST_STABLE_VERSION) +AC_SUBST(GNUCASH_LATEST_STABLE_SERIES) AC_DEFINE_UNQUOTED(GNUCASH_MAJOR_VERSION, $GNUCASH_MAJOR_VERSION, [GnuCash Major version number]) @@ -75,8 +75,8 @@ AC_DEFINE_UNQUOTED(GNUCASH_MINOR_VERSION, $GNUCASH_MINOR_VERSION, [GnuCash Minor version number]) AC_DEFINE_UNQUOTED(GNUCASH_MICRO_VERSION, $GNUCASH_MICRO_VERSION, [GnuCash Micro version number]) -AC_DEFINE_UNQUOTED(GNUCASH_LATEST_STABLE_VERSION, "$GNUCASH_LATEST_STABLE_VERSION", - [Most recent stable version of GnuCash]) +AC_DEFINE_UNQUOTED(GNUCASH_LATEST_STABLE_SERIES, "$GNUCASH_LATEST_STABLE_SERIES", + [Most recent stable GnuCash series]) dnl Set of available languages. ALL_LINGUAS="ca cs da de el en_GB es_NI es eu fa fi fr he hu it ja ko lt lv_LV nb ne nl pl pt_BR pt ro ru rw sk sv ta tr uk vi zh_CN zh_TW" diff --git a/doc/Makefile.am b/doc/Makefile.am index 29a9c0b016..1f3f51cafc 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -58,8 +58,10 @@ gnucash.1: gnucash.1.in Makefile tip_of_the_day.list: tip_of_the_day.list.in Makefile ${CC} -E -P -x c -D'N_(x)=x' -o $@.tmp $< - cat -s $@.tmp | ${SED} -e 's/^ *\"\(.*\)\" *$$/\1/' \ - -e 's:@-GNUCASH_LATEST_STABLE_VERSION-@:${GNUCASH_LATEST_STABLE_VERSION}:g' > $@ + cat -s $@.tmp | ${SED} -e 's/^ *"//' \ + -e 's/" *$$//' \ + -e 's/"* *[|] */|/' \ + -e 's:@-GNUCASH_LATEST_STABLE_SERIES-@:${GNUCASH_LATEST_STABLE_SERIES}:g' > $@ rm -f $@.tmp DISTCLEANFILES = gnc-prices.1 gnucash.1 tip_of_the_day.list diff --git a/doc/tip_of_the_day.list.in b/doc/tip_of_the_day.list.in index 76299b04d0..11c0605c27 100644 --- a/doc/tip_of_the_day.list.in +++ b/doc/tip_of_the_day.list.in @@ -1,7 +1,7 @@ N_( "Warning!! This is a DEVELOPMENT version of GnuCash. \ It probably has lots of bugs and unstable features! \ If you are looking for a stable personal finance application, \ -you should use the latest release of GnuCash @-GNUCASH_LATEST_STABLE_VERSION-@.") +you should use the latest release of GnuCash %s.")|@-GNUCASH_LATEST_STABLE_SERIES-@ N_( "The GnuCash online manual has lots of helpful information. \ If you are upgrading from earlier versions of GnuCash, the section \ diff --git a/src/gnome-utils/dialog-totd.c b/src/gnome-utils/dialog-totd.c index d636bd5af0..5e9d2db463 100644 --- a/src/gnome-utils/dialog-totd.c +++ b/src/gnome-utils/dialog-totd.c @@ -80,6 +80,8 @@ gnc_new_tip_number (GtkWidget *widget, gint offset) { GtkWidget *textview; + gchar **tip_components, **tip_args; + gchar *tip; ENTER("widget %p, offset %d", widget, offset); current_tip_number += offset; @@ -90,9 +92,14 @@ gnc_new_tip_number (GtkWidget *widget, current_tip_number = 0; gnc_gconf_set_int(GCONF_SECTION, KEY_CURRENT_TIP, current_tip_number, NULL); + tip_components = g_strsplit(tip_list[current_tip_number], "|", 0); + tip_args = &tip_components[1]; textview = gnc_glade_lookup_widget(widget, "tip_textview"); + tip = g_strdup_printf( _(tip_components[0]), tip_components[1]); + g_strfreev(tip_components); gtk_text_buffer_set_text(gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview)), - _(tip_list[current_tip_number]), -1); + tip, -1); + g_free(tip); LEAVE(""); }