[Gpredict-svn] SF.net SVN: gpredict:[203] trunk
Real time satellite tracking and orbit prediction
Status: Beta
Brought to you by:
csete
Menu
▾
▴
[Gpredict-svn] SF.net SVN: gpredict:[203] trunk
|
From: <fi...@us...> - 2009-03-21 10:02:57
|
Revision: 203
http://gpredict.svn.sourceforge.net/gpredict/?rev=203&view=rev
Author: fillods
Date: 2009-03-21 10:02:54 +0000 (Sat, 21 Mar 2009)
Log Message:
-----------
Make gettext() do its job on static strings at runtime
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/about.c
trunk/src/gtk-polar-view.c
trunk/src/gtk-sat-list.c
trunk/src/gtk-sat-map.c
trunk/src/gtk-single-sat.c
trunk/src/menubar.c
trunk/src/pass-to-txt.c
trunk/src/sat-log-browser.c
trunk/src/sat-pass-dialogs.c
trunk/src/sat-pref-formats.c
trunk/src/sat-pref-list-view.c
trunk/src/sat-pref.c
trunk/src/sat-vis.c
trunk/src/tle-update.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-03-20 14:06:21 UTC (rev 202)
+++ trunk/ChangeLog 2009-03-21 10:02:54 UTC (rev 203)
@@ -1,3 +1,24 @@
+2009-03-21 Stephane Fillod <fi...@us...>
+
+ * src/about.c:
+ * src/gtk-polar-view.c:
+ * src/gtk-sat-list.c:
+ * src/gtk-sat-map.c:
+ * src/gtk-single-sat.c:
+ * src/menubar.c:
+ * src/pass-to-txt.c:
+ * src/sat-log-browser.c:
+ * src/sat-pass-dialogs.c:
+ * src/sat-pref-formats.c:
+ * src/sat-pref-list-view.c:
+ * src/sat-pref.c:
+ * src/sat-vis.c:
+ * src/tle-update.c:
+ Make gettext() do its job on static strings at runtime.
+
+ * po/fr.po: update
+
+
2009-03-18 Alexandru Csete <oz...@gm...>
* src/sat-pref-qth.c:
@@ -32,7 +53,7 @@
2009-03-01 Alexandru Csete <oz...@gm...>
* configure.ac:
- Changed required GooCanvas version from 0.10 to 0.9 to be vompatible
+ Changed required GooCanvas version from 0.10 to 0.9 to be compatible
with older linux distributions, too (e.g. Ubuntu 8.04).
Modified: trunk/src/about.c
===================================================================
--- trunk/src/about.c 2009-03-20 14:06:21 UTC (rev 202)
+++ trunk/src/about.c 2009-03-21 10:02:54 UTC (rev 203)
@@ -96,7 +96,7 @@
"http://gpredict.oz9aec.net/");
/* gtk_about_dialog_set_website_label (GTK_ABOUT_DIALOG (dialog), */
/* _("Gpredict Website")); */
- gtk_about_dialog_set_license (GTK_ABOUT_DIALOG (dialog), license);
+ gtk_about_dialog_set_license (GTK_ABOUT_DIALOG (dialog), _(license));
gtk_about_dialog_set_wrap_license (GTK_ABOUT_DIALOG (dialog), TRUE);
iconfile = icon_file_name ("gpredict-icon.png");
icon = gdk_pixbuf_new_from_file (iconfile, NULL);
Modified: trunk/src/gtk-polar-view.c
===================================================================
--- trunk/src/gtk-polar-view.c 2009-03-20 14:06:21 UTC (rev 202)
+++ trunk/src/gtk-polar-view.c 2009-03-21 10:02:54 UTC (rev 203)
@@ -716,10 +716,10 @@
cs = g_strdup (":");
if (h > 0)
- buff = g_strdup_printf ("Next: %s\nin %s%d:%s%d%s%d",
+ buff = g_strdup_printf (_("Next: %s\nin %s%d:%s%d%s%d"),
sat->tle.sat_name, ch, h, cm, m, cs, s);
else
- buff = g_strdup_printf ("Next: %s\nin %s%d%s%d",
+ buff = g_strdup_printf (_("Next: %s\nin %s%d%s%d"),
sat->tle.sat_name, cm, m, cs, s);
Modified: trunk/src/gtk-sat-list.c
===================================================================
--- trunk/src/gtk-sat-list.c 2009-03-20 14:06:21 UTC (rev 202)
+++ trunk/src/gtk-sat-list.c 2009-03-21 10:02:54 UTC (rev 203)
@@ -355,7 +355,7 @@
NULL);
#endif
- column = gtk_tree_view_column_new_with_attributes (SAT_LIST_COL_TITLE[i],
+ column = gtk_tree_view_column_new_with_attributes (_(SAT_LIST_COL_TITLE[i]),
renderer,
"text", i,
NULL);
Modified: trunk/src/gtk-sat-map.c
===================================================================
--- trunk/src/gtk-sat-map.c 2009-03-20 14:06:21 UTC (rev 202)
+++ trunk/src/gtk-sat-map.c 2009-03-21 10:02:54 UTC (rev 203)
@@ -668,14 +668,14 @@
cs = g_strdup (":");
if (h > 0)
- buff = g_strdup_printf ("<span background=\"#%s\"> "\
- "Next: %s in %s%d:%s%d%s%d </span>",
+ buff = g_strdup_printf (_("<span background=\"#%s\"> "\
+ "Next: %s in %s%d:%s%d%s%d </span>"),
satmap->infobgd,
sat->tle.sat_name,
ch, h, cm, m, cs, s);
else
- buff = g_strdup_printf ("<span background=\"#%s\"> " \
- "Next: %s in %s%d%s%d </span>",
+ buff = g_strdup_printf (_("<span background=\"#%s\"> " \
+ "Next: %s in %s%d%s%d </span>"),
satmap->infobgd,
sat->tle.sat_name,
cm, m, cs, s);
Modified: trunk/src/gtk-single-sat.c
===================================================================
--- trunk/src/gtk-single-sat.c 2009-03-20 14:06:21 UTC (rev 202)
+++ trunk/src/gtk-single-sat.c 2009-03-21 10:02:54 UTC (rev 203)
@@ -280,7 +280,7 @@
if (GTK_SINGLE_SAT (widget)->flags & (1 << i)) {
- label1 = gtk_label_new (SINGLE_SAT_FIELD_TITLE[i]);
+ label1 = gtk_label_new (_(SINGLE_SAT_FIELD_TITLE[i]));
gtk_misc_set_alignment (GTK_MISC (label1), 1.0, 0.5);
gtk_table_attach (GTK_TABLE (GTK_SINGLE_SAT (widget)->table), label1,
0, 1, i, i+1,
@@ -294,8 +294,8 @@
GTK_FILL, GTK_SHRINK, 0, 0);
/* add tooltips */
- gtk_widget_set_tooltip_text (label1, SINGLE_SAT_FIELD_HINT[i]);
- gtk_widget_set_tooltip_text (label2, SINGLE_SAT_FIELD_HINT[i]);
+ gtk_widget_set_tooltip_text (label1, _(SINGLE_SAT_FIELD_HINT[i]));
+ gtk_widget_set_tooltip_text (label2, _(SINGLE_SAT_FIELD_HINT[i]));
/* store reference */
GTK_SINGLE_SAT (widget)->labels[i] = label2;
Modified: trunk/src/menubar.c
===================================================================
--- trunk/src/menubar.c 2009-03-20 14:06:21 UTC (rev 202)
+++ trunk/src/menubar.c 2009-03-21 10:02:54 UTC (rev 203)
@@ -202,10 +202,19 @@
GtkWidget *menuitem;
GtkWidget *image;
gchar *icon;
+ gint i;
/* create action group */
actgrp = gtk_action_group_new ("MenuActions");
+ /* i18n */
+ for (i=0; i<G_N_ELEMENTS (entries); i++) {
+ if (entries[i].label)
+ entries[i].label = _(entries[i].label);
+ if (entries[i].tooltip)
+ entries[i].tooltip = _(entries[i].tooltip);
+ }
+
gtk_action_group_add_actions (actgrp, entries, G_N_ELEMENTS (entries), NULL);
/* create UI manager */
Modified: trunk/src/pass-to-txt.c
===================================================================
--- trunk/src/pass-to-txt.c 2009-03-20 14:06:21 UTC (rev 202)
+++ trunk/src/pass-to-txt.c 2009-03-21 10:02:54 UTC (rev 203)
@@ -218,7 +218,7 @@
/* add time column */
buff = g_strnfill (size - 4, ' ');
- line = g_strconcat (SPCT[0], buff, NULL);
+ line = g_strconcat (_(SPCT[0]), buff, NULL);
linelength = size + 1;
g_free (buff);
@@ -228,7 +228,7 @@
if (fields & (1 << i)) {
/* add column to line */
- buff = g_strconcat (line, " ", SPCT[i], NULL);
+ buff = g_strconcat (line, " ", _(SPCT[i]), NULL);
g_free (line);
line = g_strdup (buff);
g_free (buff);
@@ -519,7 +519,7 @@
/* add AOS, TCA, and LOS columns */
buff = g_strnfill (size - 3, ' ');
- line = g_strconcat (MPCT[0], buff, MPCT[1], buff, MPCT[2], buff, NULL);
+ line = g_strconcat (_(MPCT[0]), buff, _(MPCT[1]), buff, _(MPCT[2]), buff, NULL);
linelength = 3 * (size + 2);
g_free (buff);
@@ -529,7 +529,7 @@
if (fields & (1 << i)) {
/* add column to line */
- buff = g_strconcat (line, " ", MPCT[i], NULL);
+ buff = g_strconcat (line, " ", _(MPCT[i]), NULL);
g_free (line);
line = g_strdup (buff);
g_free (buff);
Modified: trunk/src/sat-log-browser.c
===================================================================
--- trunk/src/sat-log-browser.c 2009-03-20 14:06:21 UTC (rev 202)
+++ trunk/src/sat-log-browser.c 2009-03-21 10:02:54 UTC (rev 203)
@@ -233,7 +233,7 @@
gtk_list_store_set (GTK_LIST_STORE (model), &item,
MSG_LIST_COL_TIME, datetime,
MSG_LIST_COL_SOURCE, str,
- MSG_LIST_COL_LEVEL, DEBUG_STR[debug_level],
+ MSG_LIST_COL_LEVEL, _(DEBUG_STR[debug_level]),
MSG_LIST_COL_MSG, message,
-1);
@@ -554,7 +554,7 @@
for (i = 0; i < MSG_LIST_COL_NUMBER; i++) {
renderer = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (MSG_LIST_COL_TITLE[i],
+ column = gtk_tree_view_column_new_with_attributes (_(MSG_LIST_COL_TITLE[i]),
renderer,
"text", i,
NULL);
Modified: trunk/src/sat-pass-dialogs.c
===================================================================
--- trunk/src/sat-pass-dialogs.c 2009-03-20 14:06:21 UTC (rev 202)
+++ trunk/src/sat-pass-dialogs.c 2009-03-21 10:02:54 UTC (rev 203)
@@ -302,7 +302,7 @@
renderer = gtk_cell_renderer_text_new ();
g_object_set (G_OBJECT (renderer), "xalign", SINGLE_PASS_COL_XALIGN[i], NULL);
- column = gtk_tree_view_column_new_with_attributes (SINGLE_PASS_COL_TITLE[i],
+ column = gtk_tree_view_column_new_with_attributes (_(SINGLE_PASS_COL_TITLE[i]),
renderer,
"text", i,
NULL);
@@ -1001,7 +1001,7 @@
renderer = gtk_cell_renderer_text_new ();
g_object_set (G_OBJECT (renderer), "xalign", MULTI_PASS_COL_XALIGN[i], NULL);
- column = gtk_tree_view_column_new_with_attributes (MULTI_PASS_COL_TITLE[i],
+ column = gtk_tree_view_column_new_with_attributes (_(MULTI_PASS_COL_TITLE[i]),
renderer,
"text", i,
NULL);
Modified: trunk/src/sat-pref-formats.c
===================================================================
--- trunk/src/sat-pref-formats.c 2009-03-20 14:06:21 UTC (rev 202)
+++ trunk/src/sat-pref-formats.c 2009-03-21 10:02:54 UTC (rev 203)
@@ -97,13 +97,13 @@
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (tzcheck),
sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME));
tips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (tips, tzcheck, tztips, NULL);
+ gtk_tooltips_set_tip (tips, tzcheck, _(tztips), NULL);
/* time format */
tfentry = gtk_entry_new ();
gtk_entry_set_max_length (GTK_ENTRY (tfentry), TIME_FORMAT_MAX_LENGTH);
tips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (tips, tfentry, tftips, NULL);
+ gtk_tooltips_set_tip (tips, tfentry, _(tftips), NULL);
text = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
gtk_entry_set_text (GTK_ENTRY (tfentry), text);
@@ -132,14 +132,14 @@
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (nsewcheck),
sat_cfg_get_bool (SAT_CFG_BOOL_USE_NSEW));
tips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (tips, nsewcheck, nsewtips, NULL);
+ gtk_tooltips_set_tip (tips, nsewcheck, _(nsewtips), NULL);
/* unit */
useimporg = sat_cfg_get_bool (SAT_CFG_BOOL_USE_IMPERIAL);
impcheck = gtk_check_button_new_with_label (_("Use Imperial units instead of Metric."));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impcheck), useimporg);
tips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (tips, impcheck, imptips, NULL);
+ gtk_tooltips_set_tip (tips, impcheck, _(imptips), NULL);
/* connect sat-pref-qth hook */
g_signal_connect (impcheck, "toggled", G_CALLBACK (systog_cb), NULL);
Modified: trunk/src/sat-pref-list-view.c
===================================================================
--- trunk/src/sat-pref-list-view.c 2009-03-20 14:06:21 UTC (rev 202)
+++ trunk/src/sat-pref-list-view.c 2009-03-21 10:02:54 UTC (rev 203)
@@ -130,7 +130,7 @@
gtk_container_add (GTK_CONTAINER (frame1), colsel);
/* Colours */
- frame2 = gtk_frame_new (_(""));
+ frame2 = gtk_frame_new ("");
gtk_frame_set_label_align (GTK_FRAME (frame2), 0.5, 0.5);
hbox = gtk_hbox_new (FALSE, 5);
Modified: trunk/src/sat-pref.c
===================================================================
--- trunk/src/sat-pref.c 2009-03-20 14:06:21 UTC (rev 202)
+++ trunk/src/sat-pref.c 2009-03-21 10:02:54 UTC (rev 203)
@@ -220,6 +220,6 @@
gtk_notebook_set_current_page (GTK_NOTEBOOK (nbook), page);
- gtk_window_set_title (GTK_WINDOW (window), WINDOW_TITLE[page]);
+ gtk_window_set_title (GTK_WINDOW (window), _(WINDOW_TITLE[page]));
}
Modified: trunk/src/sat-vis.c
===================================================================
--- trunk/src/sat-vis.c 2009-03-20 14:06:21 UTC (rev 202)
+++ trunk/src/sat-vis.c 2009-03-21 10:02:54 UTC (rev 203)
@@ -123,6 +123,6 @@
gchar *
vis_to_str (sat_vis_t vis)
{
- return g_strdup (VIS2STR[vis]);
+ return g_strdup (_(VIS2STR[vis]));
}
Modified: trunk/src/tle-update.c
===================================================================
--- trunk/src/tle-update.c 2009-03-20 14:06:21 UTC (rev 202)
+++ trunk/src/tle-update.c 2009-03-21 10:02:54 UTC (rev 203)
@@ -971,5 +971,5 @@
}
- return freq_to_str[freq];
+ return _(freq_to_str[freq]);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
