diff options
Diffstat (limited to 'fluid/nodes')
| -rw-r--r-- | fluid/nodes/Menu_Node.cxx | 14 | ||||
| -rw-r--r-- | fluid/nodes/Widget_Node.cxx | 12 |
2 files changed, 13 insertions, 13 deletions
diff --git a/fluid/nodes/Menu_Node.cxx b/fluid/nodes/Menu_Node.cxx index b669c18e0..8075c9c60 100644 --- a/fluid/nodes/Menu_Node.cxx +++ b/fluid/nodes/Menu_Node.cxx @@ -489,7 +489,7 @@ void Menu_Item_Node::write_item(fld::io::Code_Writer& f) { switch (Fluid.proj.i18n.type) { case FLD_I18N_TYPE_GNU: // we will call i18n when the menu is instantiated for the first time - f.write_c("%s(", Fluid.proj.i18n.gnu_static_function.c_str()); + f.write_c("%s(", Fluid.proj.i18n.gnu_static_function); f.write_cstring(label()); f.write_c(")"); break; @@ -605,12 +605,12 @@ void Menu_Item_Node::write_code1(fld::io::Code_Writer& f) { f.write_c("%sml->labelb = o->label();\n", f.indent()); } else if (Fluid.proj.i18n.type==FLD_I18N_TYPE_GNU) { f.write_c("%sml->labelb = %s(o->label());\n", - f.indent(), Fluid.proj.i18n.gnu_function.c_str()); + f.indent(), Fluid.proj.i18n.gnu_function); } else if (Fluid.proj.i18n.type==FLD_I18N_TYPE_POSIX) { f.write_c("%sml->labelb = catgets(%s,%s,i+%d,o->label());\n", f.indent(), - Fluid.proj.i18n.posix_file.empty() ? "_catalog" : Fluid.proj.i18n.posix_file.c_str(), - Fluid.proj.i18n.posix_set.c_str(), msgnum()); + (Fluid.proj.i18n.posix_file && Fluid.proj.i18n.posix_file[0]) ? Fluid.proj.i18n.posix_file : "_catalog", + Fluid.proj.i18n.posix_set, msgnum()); } f.write_c("%sml->typea = FL_IMAGE_LABEL;\n", f.indent()); f.write_c("%sml->typeb = FL_NORMAL_LABEL;\n", f.indent()); @@ -628,12 +628,12 @@ void Menu_Item_Node::write_code1(fld::io::Code_Writer& f) { start_menu_initialiser(f, menuItemInitialized, mname, i); if (Fluid.proj.i18n.type==FLD_I18N_TYPE_GNU) { f.write_c("%so->label(%s(o->label()));\n", - f.indent(), Fluid.proj.i18n.gnu_function.c_str()); + f.indent(), Fluid.proj.i18n.gnu_function); } else if (Fluid.proj.i18n.type==FLD_I18N_TYPE_POSIX) { f.write_c("%so->label(catgets(%s,%s,i+%d,o->label()));\n", f.indent(), - Fluid.proj.i18n.posix_file.empty() ? "_catalog" : Fluid.proj.i18n.posix_file.c_str(), - Fluid.proj.i18n.posix_set.c_str(), msgnum()); + (Fluid.proj.i18n.posix_file && Fluid.proj.i18n.posix_file[0]) ? Fluid.proj.i18n.posix_file : "_catalog", + Fluid.proj.i18n.posix_set, msgnum()); } } } diff --git a/fluid/nodes/Widget_Node.cxx b/fluid/nodes/Widget_Node.cxx index 6f5a6a0fb..d5d256dbe 100644 --- a/fluid/nodes/Widget_Node.cxx +++ b/fluid/nodes/Widget_Node.cxx @@ -1747,14 +1747,14 @@ void Widget_Node::write_code1(fld::io::Code_Writer& f) { f.write_cstring(label()); break; case FLD_I18N_TYPE_GNU : /* GNU gettext */ - f.write_c("%s(", Fluid.proj.i18n.gnu_function.c_str()); + f.write_c("%s(", Fluid.proj.i18n.gnu_function); f.write_cstring(label()); f.write_c(")"); break; case FLD_I18N_TYPE_POSIX : /* POSIX catgets */ f.write_c("catgets(%s,%s,%d,", - Fluid.proj.i18n.posix_file.empty() ? "_catalog" : Fluid.proj.i18n.posix_file.c_str(), - Fluid.proj.i18n.posix_set.c_str(), msgnum()); + (Fluid.proj.i18n.posix_file == 0 || Fluid.proj.i18n.posix_file[0] == 0) ? "_catalog" : Fluid.proj.i18n.posix_file, + Fluid.proj.i18n.posix_set, msgnum()); f.write_cstring(label()); f.write_c(")"); break; @@ -1821,14 +1821,14 @@ void Widget_Node::write_widget_code(fld::io::Code_Writer& f) { f.write_cstring(tooltip()); break; case FLD_I18N_TYPE_GNU : /* GNU gettext */ - f.write_c("%s(", Fluid.proj.i18n.gnu_function.c_str()); + f.write_c("%s(", Fluid.proj.i18n.gnu_function); f.write_cstring(tooltip()); f.write_c(")"); break; case FLD_I18N_TYPE_POSIX : /* POSIX catgets */ f.write_c("catgets(%s,%s,%d,", - Fluid.proj.i18n.posix_file.empty() ? "_catalog" : Fluid.proj.i18n.posix_file.c_str(), - Fluid.proj.i18n.posix_set.c_str(), + (Fluid.proj.i18n.posix_file == 0 || Fluid.proj.i18n.posix_file[0] == 0) ? "_catalog" : Fluid.proj.i18n.posix_file, + Fluid.proj.i18n.posix_set, msgnum() + 1); f.write_cstring(tooltip()); f.write_c(")"); |