more i18n for CSQC
authorRudolf Polzer <divverent@alientrap.org>
Tue, 18 Jan 2011 20:32:57 +0000 (21:32 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 18 Jan 2011 20:32:57 +0000 (21:32 +0100)
qcsrc/client/miscfunctions.qc
qcsrc/client/prandom.qc
qcsrc/client/target_music.qc
qcsrc/client/teamplay.qc
qcsrc/client/waypointsprites.qc
qcsrc/i18n-guide.txt

index 90098a7..9b1d328 100644 (file)
@@ -31,7 +31,7 @@ void restartAnnouncer_Think() {
        }
        else {
                if (!spectatee_status) //do cprint only for players
-                       centerprint(strcat("^1Game starts in ", ftos(countdown_rounded), " seconds"));
+                       centerprint(sprintf("^1Game starts in %d seconds", countdown_rounded));
 
                if(countdown_rounded <= 3 && countdown_rounded >= 1) {
                        sound(world, CHAN_AUTO, strcat("announcer/", autocvar_cl_announcer, "/", ftos(countdown_rounded), ".wav"), VOL_BASEVOICE, ATTN_NONE);
@@ -71,7 +71,6 @@ void maptimeAnnouncer() {
                        //if we're in warmup mode, check whether there's a warmup timelimit
                        if not (warmuplimit == -1 && warmup_stage) {
                                announcer_5min = TRUE;
-                               //dprint("i will play the sound, I promise!\n");
                                sound(world, CHAN_AUTO, strcat("announcer/", autocvar_cl_announcer, "/5minutesremain.wav"), VOL_BASEVOICE, ATTN_NONE);
                        }
        }
@@ -111,12 +110,12 @@ void carrierAnnouncer() {
        blueflag = (stat_items/IT_BLUE_FLAG_TAKEN) & 3;
 
        if (redflag == 3 && redflag != redflag_prev) {
-               item = "^1RED^7 flag";
+               item = _("^1RED^7 flag");
                pickup = (redflag_prev == 2);
        }
 
        if (blueflag == 3 && blueflag != blueflag_prev) {
-               item = "^4BLUE^7 flag";
+               item = _("^4BLUE^7 flag");
                pickup = (blueflag_prev == 2);
        }
 
@@ -124,11 +123,11 @@ void carrierAnnouncer() {
        {
                if (pickup) {
                        if (autocvar_cl_notify_carried_items & 2)
-                               centerprint(strcat("You picked up the ", item, "!"));
+                               centerprint(sprintf("You picked up the %s!", item));
                }
                else {
                        if (autocvar_cl_notify_carried_items & 1)
-                               centerprint(strcat("You got the ", item, "!"));
+                               centerprint(sprintf("You got the %s!", item));
                }
        }
 
@@ -281,7 +280,7 @@ void RemoveTeam(entity Team)
 
        if(!tm)
        {
-               print("Trying to remove a team which is not in the teamlist!");
+               print(_("Trying to remove a team which is not in the teamlist!"));
                return;
        }
        parent.sort_next = Team.sort_next;
index 1fae8ab..1132d06 100644 (file)
@@ -9,7 +9,7 @@ float prandom()
        prandom_seed = c;
 
 #ifdef USE_PRANDOM_DEBUG
-       print("RANDOM -> ", ftos(c), "\n");
+       dprint("RANDOM -> ", ftos(c), "\n");
 #endif
 
        return c / 65536; // in [0..1[
@@ -34,14 +34,14 @@ void psrandom(float seed)
 {
        prandom_seed = seed;
 #ifdef USE_PRANDOM_DEBUG
-       print("SRANDOM ", ftos(seed), "\n");
+       dprint("SRANDOM ", ftos(seed), "\n");
 #endif
 }
 
 #ifdef USE_PRANDOM_DEBUG
 void prandom_debug()
 {
-       print("Current random seed = ", ftos(prandom_seed), "\n");
+       dprint("Current random seed = ", ftos(prandom_seed), "\n");
 }
 #endif
 #endif
index 5703c14..b50d5a8 100644 (file)
@@ -90,7 +90,7 @@ void Net_TargetMusic()
                sound(e, CHAN_VOICE, e.noise, 0, ATTN_NONE);
                if(getsoundtime(e, CHAN_VOICE) < 0)
                {
-                       print("Cannot initialize sound ", e.noise, "\n");
+                       print(sprintf(_("Cannot initialize sound %s\n"), e.noise));
                        strunzone(e.noise);
                        e.noise = string_null;
                }
@@ -178,7 +178,7 @@ void Ent_ReadTriggerMusic()
                        sound(self, CHAN_VOICE, self.noise, 0, ATTN_NONE);
                        if(getsoundtime(self, CHAN_VOICE) < 0)
                        {
-                               print("Cannot initialize sound ", self.noise, "\n");
+                               print(sprintf(_("Cannot initialize sound %s\n"), self.noise));
                                strunzone(self.noise);
                                self.noise = string_null;
                        }
index 02c40ba..7d5031f 100644 (file)
@@ -52,10 +52,10 @@ string GetTeamName(float color)
 {
        switch(color)
        {
-       default: return "Spectators";
-       case COLOR_TEAM1: return "Red Team";
-       case COLOR_TEAM2: return "Blue Team";
-       case COLOR_TEAM3: return "Yellow Team";
-       case COLOR_TEAM4: return "Pink Team";
+       default: return _("Spectators");
+       case COLOR_TEAM1: return _("Red Team");
+       case COLOR_TEAM2: return _("Blue Team");
+       case COLOR_TEAM3: return _("Yellow Team");
+       case COLOR_TEAM4: return _("Pink Team");
        }
 }
index 1a35579..8ecadae 100644 (file)
@@ -336,7 +336,6 @@ void Ent_WaypointSprite()
                        else
                                self.build_starthealth = 0;
                        self.build_finished = servertime + t / 32;
-                       //print("build: ", ftos(self.build_finished - self.build_started), "\n");
                }
        }
        else
index 9374c7e..e4efbbc 100644 (file)
@@ -29,10 +29,6 @@ Unresolved TODO:
 
 - translated campaigns
 
-client/miscfunctions.qc
-client/modeleffects.qc
-client/movetypes.qc
-client/noise.qh
 client/particles.qc
 client/prandom.qc
 client/projectile.qc