allpy
changeset 462:3b842784ff2d
blocks3d/wt: move remaining texts to xml file
| author | boris <bnagaev@gmail.com> |
|---|---|
| date | Thu, 17 Feb 2011 00:27:09 +0300 |
| parents | 018ad778cf91 |
| children | 88d37ad9b7dd |
| files | blocks3d/wt/blocks3d-wt-widget.C blocks3d/wt/locales/blocks3d.xml |
| diffstat | 2 files changed, 13 insertions(+), 5 deletions(-) [+] |
line diff
1.1 --- a/blocks3d/wt/blocks3d-wt-widget.C Thu Feb 17 00:17:37 2011 +0300 1.2 +++ b/blocks3d/wt/blocks3d-wt-widget.C Thu Feb 17 00:27:09 2011 +0300 1.3 @@ -124,10 +124,11 @@ 1.4 1.5 void Blocks3DWidget::fileTooLarge() 1.6 { 1.7 - Wt::WMessageBox::show("Error", "File too large", Wt::Ok); 1.8 + Wt::WMessageBox::show(tr("Error"), tr("file_too_large"), Wt::Ok); 1.9 } 1.10 1.11 -void Blocks3DWidget::textarea_from_file(Wt::WTextArea* ta, const char* file) 1.12 +void Blocks3DWidget::textarea_from_file(Wt::WTextArea* ta, 1.13 + const char* file) 1.14 { 1.15 std::string temp(""); 1.16 std::string total(""); 1.17 @@ -147,7 +148,7 @@ 1.18 ta->setText(total); 1.19 1.20 new Wt::WBreak(results_panel); 1.21 - new Wt::WText("Upload finished", results_panel); 1.22 + new Wt::WText(tr("upload_finished"), results_panel); 1.23 } 1.24 1.25 void Blocks3DWidget::alignment_uploaded() 1.26 @@ -180,8 +181,7 @@ 1.27 if (current_taks.size() >= Malakite::max_simultaneous_tasks) 1.28 { 1.29 new Wt::WBreak(results_panel); 1.30 - new Wt::WText("Service is overloaded. " 1.31 - "Please wait until other tasks are completed", results_panel); 1.32 + new Wt::WText(tr("server_overloaded"), results_panel); 1.33 return; 1.34 } 1.35
2.1 --- a/blocks3d/wt/locales/blocks3d.xml Thu Feb 17 00:17:37 2011 +0300 2.2 +++ b/blocks3d/wt/locales/blocks3d.xml Thu Feb 17 00:27:09 2011 +0300 2.3 @@ -25,6 +25,14 @@ 2.4 <message id='View'>View</message> 2.5 <message id='Download'>Download</message> 2.6 2.7 + <message id='Error'>Error</message> 2.8 + <message id='file_too_large'>File too large</message> 2.9 + <message id='upload_finished'>Upload finished</message> 2.10 + <message id='server_overloaded'> 2.11 + Service is overloaded. 2.12 + Please wait until other tasks are completed 2.13 + </message> 2.14 + 2.15 2.16 </messages> 2.17