IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2026-09-03 20:53:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Bug #609472: Fix translation of displayed style sheet names in the style sheet editor.

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19903 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming
2010-12-03 21:14:54 +00:00
parent 8b43258ac6
commit 9cdbe69e0f
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/report/report-gnome/dialog-style-sheet.c
+19 -8
View File
@@ -181,8 +181,7 @@ gnc_style_sheet_new (StyleSheetDialog * ssd)
GtkTreeModel * template_model; GtkTreeModel * template_model;
GtkWidget * name_entry; GtkWidget * name_entry;
gint dialog_retval; gint dialog_retval;
char * template_str = NULL; GList *template_names = NULL;
const char * name_str = NULL;
/* get the new name for the style sheet */ /* get the new name for the style sheet */
GladeXML *xml = gnc_glade_xml_new ("report.glade", GladeXML *xml = gnc_glade_xml_new ("report.glade",
@@ -191,6 +190,8 @@ gnc_style_sheet_new (StyleSheetDialog * ssd)
template_combo = glade_xml_get_widget (xml, "template_combobox"); template_combo = glade_xml_get_widget (xml, "template_combobox");
name_entry = glade_xml_get_widget (xml, "name_entry"); name_entry = glade_xml_get_widget (xml, "name_entry");
g_assert(ssd);
/* Erase the initial dummy entry. */ /* Erase the initial dummy entry. */
template_model = gtk_combo_box_get_model(GTK_COMBO_BOX(template_combo)); template_model = gtk_combo_box_get_model(GTK_COMBO_BOX(template_combo));
gtk_list_store_clear(GTK_LIST_STORE(template_model)); gtk_list_store_clear(GTK_LIST_STORE(template_model));
@@ -199,8 +200,14 @@ gnc_style_sheet_new (StyleSheetDialog * ssd)
for (; !scm_is_null(templates); templates = SCM_CDR(templates)) for (; !scm_is_null(templates); templates = SCM_CDR(templates))
{ {
SCM t = SCM_CAR(templates); SCM t = SCM_CAR(templates);
gtk_combo_box_append_text(GTK_COMBO_BOX(template_combo), const char* orig_name = scm_to_locale_string(scm_call_1(t_name, t));
scm_to_locale_string(scm_call_1(t_name, t)));
/* Store the untranslated names for lookup later */
template_names = g_list_prepend (template_names, (gpointer)orig_name);
/* The displayed name should be translated */
gtk_combo_box_prepend_text(GTK_COMBO_BOX(template_combo),
_(orig_name));
} }
gtk_combo_box_set_active(GTK_COMBO_BOX(template_combo), 0); gtk_combo_box_set_active(GTK_COMBO_BOX(template_combo), 0);
@@ -210,8 +217,9 @@ gnc_style_sheet_new (StyleSheetDialog * ssd)
if (dialog_retval == GTK_RESPONSE_OK) if (dialog_retval == GTK_RESPONSE_OK)
{ {
template_str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(template_combo)); gint choice = gtk_combo_box_get_active (GTK_COMBO_BOX(template_combo));
name_str = gtk_entry_get_text(GTK_ENTRY(name_entry)); const char *template_str = g_list_nth_data (template_names, choice);
const char *name_str = gtk_entry_get_text(GTK_ENTRY(name_entry));
if (name_str && strlen(name_str) == 0) if (name_str && strlen(name_str) == 0)
{ {
/* If the name is empty, we display an error dialog but /* If the name is empty, we display an error dialog but
@@ -225,9 +233,9 @@ gnc_style_sheet_new (StyleSheetDialog * ssd)
scm_makfrom0str(template_str), scm_makfrom0str(template_str),
scm_makfrom0str(name_str)); scm_makfrom0str(name_str));
} }
g_free(template_str);
} }
g_list_free (template_names);
gtk_widget_destroy(dlg); gtk_widget_destroy(dlg);
return(new_ss); return(new_ss);
} }
@@ -256,9 +264,12 @@ gnc_style_sheet_select_dialog_add_one(StyleSheetDialog * ss,
scm_gc_protect_object(sheet_info); scm_gc_protect_object(sheet_info);
gtk_list_store_append (ss->list_store, &iter); gtk_list_store_append (ss->list_store, &iter);
gtk_list_store_set (ss->list_store, &iter, gtk_list_store_set (ss->list_store, &iter,
COLUMN_NAME, c_name, /* Translate the displayed name */
COLUMN_NAME, _(c_name),
COLUMN_STYLESHEET, sheet_info, COLUMN_STYLESHEET, sheet_info,
-1); -1);
/* The translation of the name fortunately doesn't affect the
* lookup because that is done through the sheet_info argument. */
if (select) if (select)
{ {