From 5f55c6d463e1089c5ec1b2151327c74b4ec1e917 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sun, 16 Jan 2011 21:25:44 +0100 Subject: [PATCH] more gettextizing... now "only" xonotic/ is left for menuqc --- qcsrc/menu/item/gecko.c | 2 +- qcsrc/menu/item/listbox.c | 2 +- qcsrc/menu/item/slider.c | 2 +- qcsrc/menu/item/textslider.c | 4 ++-- qcsrc/menu/menu.qc | 2 +- qcsrc/menu/stringfilelist.txt | 20 +------------------- 6 files changed, 7 insertions(+), 25 deletions(-) diff --git a/qcsrc/menu/item/gecko.c b/qcsrc/menu/item/gecko.c index 139e87e1a..dd752e6e5 100644 --- a/qcsrc/menu/item/gecko.c +++ b/qcsrc/menu/item/gecko.c @@ -46,7 +46,7 @@ void Gecko_draw(entity me) local vector fontsize; fontsize_x = fontsize_y = 1.0 / 30.0; fontsize_z = 0.0; - draw_Text( '0 0 0', "Browser not initialized!", fontsize, '1 1 1', 1.0, 0 ); + draw_Text( '0 0 0', _("Browser not initialized!"), fontsize, '1 1 1', 1.0, 0 ); } } diff --git a/qcsrc/menu/item/listbox.c b/qcsrc/menu/item/listbox.c index 361e3cb32..9664e9376 100644 --- a/qcsrc/menu/item/listbox.c +++ b/qcsrc/menu/item/listbox.c @@ -297,6 +297,6 @@ void ListBox_clickListBoxItem(entity me, float i, vector where) void ListBox_drawListBoxItem(entity me, float i, vector absSize, float selected) { - draw_Text('0 0 0', strcat("Item ", ftos(i)), eX * (8 / absSize_x) + eY * (8 / absSize_y), (selected ? '0 1 0' : '1 1 1'), 1, 0); + draw_Text('0 0 0', sprintf(_("Item %d"), i), eX * (8 / absSize_x) + eY * (8 / absSize_y), (selected ? '0 1 0' : '1 1 1'), 1, 0); } #endif diff --git a/qcsrc/menu/item/slider.c b/qcsrc/menu/item/slider.c index c8bab9bf8..9a8a35fdc 100644 --- a/qcsrc/menu/item/slider.c +++ b/qcsrc/menu/item/slider.c @@ -61,7 +61,7 @@ void Slider_setSliderValue(entity me, float val) } string Slider_toString(entity me) { - return strcat(ftos(me.value), " (", me.valueToText(me, me.value), ")"); + return sprintf(_("%d (%s)"), me.value, me.valueToText(me, me.value)); } void Slider_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize) { diff --git a/qcsrc/menu/item/textslider.c b/qcsrc/menu/item/textslider.c index c4a7af7a8..028a1603a 100644 --- a/qcsrc/menu/item/textslider.c +++ b/qcsrc/menu/item/textslider.c @@ -26,9 +26,9 @@ string TextSlider_valueToIdentifier(entity me, float val) string TextSlider_valueToText(entity me, float val) { if(val >= me.nValues) - return "custom"; + return _("custom"); if(val < 0) - return "custom"; + return _("custom"); return me.(valueStrings[val]); } void TextSlider_setValueFromIdentifier(entity me, string id) diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc index 92da56a25..c4797019f 100644 --- a/qcsrc/menu/menu.qc +++ b/qcsrc/menu/menu.qc @@ -25,7 +25,7 @@ void() m_init = check_unacceptable_compiler_bugs(); #ifdef WATERMARK - print("^4MQC Build information: ", WATERMARK(), "\n"); + print(sprintf(_("^4MQC Build information: %s\n"), WATERMARK())); #endif // list all game dirs (TEST) diff --git a/qcsrc/menu/stringfilelist.txt b/qcsrc/menu/stringfilelist.txt index 0edf372a0..9e5aa089e 100644 --- a/qcsrc/menu/stringfilelist.txt +++ b/qcsrc/menu/stringfilelist.txt @@ -1,5 +1,6 @@ Guideline: - do NOT translate strings in error() messages, or in dprint()! +- delete obviously useless developer prints while at it - change obvious developer prints from print to dprint (even in comments), unless in developer-only functions (e.g. *dumptree*) - mark translatable strings with _() @@ -7,25 +8,6 @@ Guideline: List of files to do: -./item/borderimage.c -./item/button.c -./item.c -./item/checkbox.c -./item/container.c -./item/dialog.c -./item/gecko.c -./item/inputbox.c -./item/label.c -./item/listbox.c -./item/nexposee.c -./item/slider.c -./item/textslider.c -./mbuiltin.qh -./menu.qc -./menu.qh -./oo/base.h -./skin-customizables.inc -./skin.qh ./xonotic/button.c ./xonotic/campaign.c ./xonotic/charmap.c -- 2.39.2