q3k
/
extremetuxracer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved translatability of some strings 

Fixed wrong course dimensions in wild_west_chute_out

git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/trunk@660 0420edf4-82e4-42fc-9478-35b55e6d67a3
master
pkeus 2016-05-18 09:20:27 +00:00
parent 0513371751
commit 443ff32862
9 changed files with 50 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/courses/extras/wild_west_chute_out/course.dim
View File

@ -1,4 +1,4 @@
*[width]90[length]480[play_width]55[play_length]470
*[width]90[length]480[play_width]90[play_length]480
[startx]45.00[starty]3.50[angle]28.00[scale]9.00
[env]etr
[author]J.W. Bruce

16
data/translations/de_DE.lst
View File

@ -118,4 +118,18 @@
*[idx] 95 [engl] Loading terrains failed. [trans] Terrain konnten nicht geladen werden.
*[idx] 96 [engl] Loading avatars failed. [trans] Avatare konnten nicht geladen werden.
*[idx] 97 [engl] herrings [trans] Heringe
*[idx] 98 [engl] sec [trans] Sek
*[idx] 98 [engl] sec [trans] Sek
*[idx] 99 [engl] 1st [trans] 1.
*[idx] 100 [engl] 2nd [trans] 2.
*[idx] 101 [engl] 3rd [trans] 3.
*[idx] 102 [engl] 4th [trans] 4.
*[idx] 103 [engl] 5th [trans] 5.
*[idx] 104 [engl] 6th [trans] 6.
*[idx] 105 [engl] 7th [trans] 7.
*[idx] 106 [engl] 8th [trans] 8.
*[idx] 107 [engl] 9th [trans] 9.
*[idx] 108 [engl] 10th [trans] 10.
*[idx] 109 [engl] Unknown [trans] Unbekannt
*[idx] 110 [engl] auto [trans] automatisch

15
data/translations/xx_XX.lst
View File

@ -116,4 +116,17 @@
*[idx] 95 [engl] Loading terrains failed. [trans]
*[idx] 96 [engl] Loading avatars failed. [trans]
*[idx] 97 [engl] herrings [trans]
*[idx] 98 [engl] sec [trans]
*[idx] 98 [engl] sec [trans]
*[idx] 99 [engl] 1st [trans]
*[idx] 100 [engl] 2nd [trans]
*[idx] 101 [engl] 3rd [trans]
*[idx] 102 [engl] 4th [trans]
*[idx] 103 [engl] 5th [trans]
*[idx] 104 [engl] 6th [trans]
*[idx] 105 [engl] 7th [trans]
*[idx] 106 [engl] 8th [trans]
*[idx] 107 [engl] 9th [trans]
*[idx] 108 [engl] 10th [trans]
*[idx] 109 [engl] Unknown [trans]

2
src/course.cpp
View File

@ -662,7 +662,7 @@ bool CCourseList::Load(const std::string& dir) {
}
const std::string& line2 = paramlist.front();
courses[i].author = SPStrN(line2, "author", "unknown");
courses[i].author = SPStrN(line2, "author", Trans.Text(109));
courses[i].size.x = SPFloatN(line2, "width", 100);
courses[i].size.y = SPFloatN(line2, "length", 1000);
courses[i].play_size.x = SPFloatN(line2, "play_width", 90);

2
src/game_ctrl.cpp
View File

@ -62,7 +62,7 @@ bool CEvents::LoadEventList() {
if (type == 1) {
CupList.emplace_back(SPStrN(*line, "cup", errorString),
SPStrN(*line, "name", "unknown"),
SPStrN(*line, "desc", "unknown"));
SPStrN(*line, "desc", emptyString));
int num = SPIntN(*line, "num", 0);
CupList.back().races.resize(num);
for (int ii=0; ii<num; ii++) {

5
src/score.cpp
View File

@ -243,9 +243,6 @@ void CScore::Enter() {
courseName = AddFramedText(area.left, frametop - 2 + frameheight + 20, framewidth, frameheight, 3, colMBackgr, "", FT.GetSize(), true);
}
const std::string ordinals[10] =
{"1:st", "2:nd", "3:rd", "4:th", "5:th", "6:th", "7:th", "8:th", "9:th", "10:th"};
void CScore::Loop(float timestep) {
ScopedRenderMode rm(GUI);
Winsys.clear();
@ -277,7 +274,7 @@ void CScore::Loop(float timestep) {
if (list != nullptr && list->numScores > 0) {
for (int i=0; i<std::min(MAX_SCORES, list->numScores); i++) {
int y = listtop + i*linedist;
FT.DrawString(area.left, y, ordinals[i]);
FT.DrawString(area.left, y, Trans.Text(99+i));
FT.DrawString(area.left + dd1, y, Int_StrN(list->scores[i].points));
FT.DrawString(area.left + dd2, y, list->scores[i].player);
FT.DrawString(area.left + dd3, y,

14
src/translation.cpp
View File

@ -144,6 +144,20 @@ void CTranslation::SetDefaultTranslations() {
texts[97] = "herrings";
texts[98] = "sec";
texts[99] = "1st";
texts[100] = "2nd";
texts[101] = "3rd";
texts[102] = "4th";
texts[103] = "5th";
texts[104] = "6th";
texts[105] = "7th";
texts[106] = "8th";
texts[107] = "9th";
texts[108] = "10th";
texts[109] = "Unknown";
texts[110] = "auto";
}
const sf::String& CTranslation::Text(std::size_t idx) const {

3
src/translation.h
View File

@ -21,8 +21,7 @@ GNU General Public License for more details.
#include "bh.h"
#include <vector>
#define NUM_COMMON_TEXTS 99
#define MAX_COMMON_TEXT_LINES NUM_COMMON_TEXTS*2
#define NUM_COMMON_TEXTS 111
/* --------------------------------------------------------------------
Name convention:

3
src/winsys.cpp
View File

@ -26,6 +26,7 @@ GNU General Public License for more details.
#include "game_ctrl.h"
#include "score.h"
#include "ogl.h"
#include "translation.h"
#include <iostream>
TVector2i cursor_pos(0, 0);
@ -64,7 +65,7 @@ const TScreenRes& CWinsys::GetResolution(std::size_t idx) const {
std::string CWinsys::GetResName(std::size_t idx) const {
if (idx >= NUM_RESOLUTIONS) return "800 x 600";
if (idx == 0) return ("auto");
if (idx == 0) return (Trans.Text(110));
std::string line = Int_StrN(resolutions[idx].width);
line += " x " + Int_StrN(resolutions[idx].height);
return line;