i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied yet another localization patch made by Jorma Karvonen. Fixes #7105. Thanks.

Browse Source 
Note that I have not applied the localization of terminal error messages (printf-handled ones). 
That stuff is not visible in the normal using circumstances but will take translator's time
for localizing it. A bit of disk space is also required to store those lines.



git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40505 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Siarzhuk Zharski
2011-02-15 09:22:57 +00:00
parent df0ad9c12a
commit 0ba57e76a4
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/cdplayer/CDPlayer.cpp
+20 -13
View File
@@ -87,7 +87,7 @@ CDPlayer::CDPlayer(BRect frame, const char *name, uint32 resizeMask,
BAlert *alert = new BAlert("CDPlayer", B_TRANSLATE( BAlert *alert = new BAlert("CDPlayer", B_TRANSLATE(
"It appears that there are no CD" "It appears that there are no CD"
" drives on your computer or there is no system software to " " drives on your computer or there is no system software to "
"support one. Sorry."), "OK"); "support one. Sorry."), B_TRANSLATE("OK"));
alert->Go(); alert->Go();
} }
@@ -151,14 +151,14 @@ CDPlayer::BuildGUI()
r.OffsetBy(0, r.Height() + 5); r.OffsetBy(0, r.Height() + 5);
r.right = r.left + (r.Width() / 2); r.right = r.left + (r.Width() / 2);
fTrackTime = new BStringView(r, "TrackTime", fTrackTime = new BStringView(r, "TrackTime",
"Track: 88:88 / 88:88", B_FOLLOW_LEFT_RIGHT); B_TRANSLATE("Track: 88:88 / 88:88"), B_FOLLOW_LEFT_RIGHT);
fTrackTime->ResizeToPreferred(); fTrackTime->ResizeToPreferred();
fTrackTime->SetText(B_TRANSLATE("Track: --:-- / --:--")); fTrackTime->SetText(B_TRANSLATE("Track: --:-- / --:--"));
box->AddChild(fTrackTime); box->AddChild(fTrackTime);
r.OffsetTo(fTrackTime->Frame().right + 5, r.top); r.OffsetTo(fTrackTime->Frame().right + 5, r.top);
fDiscTime = new BStringView(r, "DiscTime", fDiscTime = new BStringView(r, "DiscTime",
"Disc: 88:88 / 88:88", B_FOLLOW_RIGHT); B_TRANSLATE("Disc: 88:88 / 88:88"), B_FOLLOW_RIGHT);
fDiscTime->ResizeToPreferred(); fDiscTime->ResizeToPreferred();
fDiscTime->SetText(B_TRANSLATE("Disc: --:-- / --:--")); fDiscTime->SetText(B_TRANSLATE("Disc: --:-- / --:--"));
box->AddChild(fDiscTime); box->AddChild(fDiscTime);
@@ -475,8 +475,8 @@ CDPlayer::_WatchCDState()
SetLabel(fCDTitle, B_TRANSLATE("CD drive is empty")); SetLabel(fCDTitle, B_TRANSLATE("CD drive is empty"));
SetLabel(fCurrentTrack, ""); SetLabel(fCurrentTrack, "");
SetLabel(fTrackTime, "Track: --:-- / --:--"); SetLabel(fTrackTime, B_TRANSLATE("Track: --:-- / --:--"));
SetLabel(fDiscTime, "Disc: --:-- / --:--"); SetLabel(fDiscTime, B_TRANSLATE("Disc: --:-- / --:--"));
fPlayList.SetTrackCount(0); fPlayList.SetTrackCount(0);
fPlayList.SetStartingTrack(1); fPlayList.SetStartingTrack(1);
fPlayList.SetCurrentTrack(1); fPlayList.SetCurrentTrack(1);
@@ -580,7 +580,7 @@ CDPlayer::_WatchCDState()
} }
if (updateTrackGui) { if (updateTrackGui) {
BString currentTrackName; BString currentTrackName(B_TRANSLATE("Track %whichTrack%: %trackAt%"));
if (playlistTrack >= 0) { if (playlistTrack >= 0) {
int16 whichTrack = playlistTrack; int16 whichTrack = playlistTrack;
@@ -588,8 +588,14 @@ CDPlayer::_WatchCDState()
if (whichTrack == 0) if (whichTrack == 0)
whichTrack++; whichTrack++;
currentTrackName << "Track " << whichTrack << ": " BString stringTrack;
<< fCDData.TrackAt(whichTrack - 1); stringTrack << whichTrack;
BString stringTrackAt;
stringTrack << fCDData.TrackAt(whichTrack - 1);
currentTrackName.ReplaceFirst("%whichTrack%", stringTrack);
currentTrackName.ReplaceFirst("%trackAt%", stringTrackAt);
SetLabel(fCurrentTrack, currentTrackName.String()); SetLabel(fCurrentTrack, currentTrackName.String());
@@ -606,13 +612,13 @@ CDPlayer::_WatchCDState()
if (fCDDrive.GetTime(trackTime, discTime)) { if (fCDDrive.GetTime(trackTime, discTime)) {
fCDDrive.GetTimeForDisc(discTotal); fCDDrive.GetTimeForDisc(discTotal);
sprintf(timeString, "Disc: %ld:%.2ld / %ld:%.2ld", sprintf(timeString, B_TRANSLATE("Disc: %ld:%.2ld / %ld:%.2ld"),
discTime.GetMinutes(), discTime.GetSeconds(), discTime.GetMinutes(), discTime.GetSeconds(),
discTotal.GetMinutes(), discTotal.GetSeconds()); discTotal.GetMinutes(), discTotal.GetSeconds());
SetLabel(fDiscTime, timeString); SetLabel(fDiscTime, timeString);
fCDDrive.GetTimeForTrack(playlistTrack, trackTotal); fCDDrive.GetTimeForTrack(playlistTrack, trackTotal);
sprintf(timeString, "Track: %ld:%.2ld / %ld:%.2ld", sprintf(timeString, B_TRANSLATE("Track: %ld:%.2ld / %ld:%.2ld"),
trackTime.GetMinutes(), trackTime.GetSeconds(), trackTime.GetMinutes(), trackTime.GetSeconds(),
trackTotal.GetMinutes(), trackTotal.GetSeconds()); trackTotal.GetMinutes(), trackTotal.GetSeconds());
SetLabel(fTrackTime, timeString); SetLabel(fTrackTime, timeString);
@@ -627,8 +633,9 @@ CDPlayer::_WatchCDState()
CDPlayerWindow::CDPlayerWindow() CDPlayerWindow::CDPlayerWindow()
: BWindow(BRect (100, 100, 405, 280), "CDPlayer", B_TITLED_WINDOW, : BWindow(BRect (100, 100, 405, 280), B_TRANSLATE("CDPlayer"),
B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS) B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE |
B_ASYNCHRONOUS_CONTROLS)
{ {
} }
@@ -648,7 +655,7 @@ CDPlayerApplication::CDPlayerApplication()
: BApplication("application/x-vnd.Haiku-CDPlayer") : BApplication("application/x-vnd.Haiku-CDPlayer")
{ {
BWindow *window = new CDPlayerWindow(); BWindow *window = new CDPlayerWindow();
CDPlayer *view = new CDPlayer(window->Bounds(), "CD"); CDPlayer *view = new CDPlayer(window->Bounds(), B_TRANSLATE("CD"));
if (view->InitCheck()) { if (view->InitCheck()) {
window->ResizeTo(view->Bounds().Width(), view->Bounds().Height()); window->ResizeTo(view->Bounds().Width(), view->Bounds().Height());
window->AddChild(view); window->AddChild(view);