summaryrefslogtreecommitdiff
path: root/tools/editor
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2016-05-21 16:34:56 +0200
committerRémi Verschelde <rverschelde@gmail.com>2016-05-21 16:34:56 +0200
commitbe053e62860a6b9d712e6ece4cde025569ff2efb (patch)
tree74da8d8fd753cffb9ec7009c2eee13741a0ffb3b /tools/editor
parenta65a66b2a3b44ae93258cbdab7388752d1a05fad (diff)
i18n: Use %d instead of %i in vformat
Fixes #4742.
Diffstat (limited to 'tools/editor')
-rw-r--r--tools/editor/animation_editor.cpp2
-rw-r--r--tools/editor/code_editor.cpp2
-rw-r--r--tools/editor/dependency_editor.cpp2
-rw-r--r--tools/editor/editor_node.cpp4
-rw-r--r--tools/editor/io_plugins/editor_mesh_import_plugin.cpp4
-rw-r--r--tools/editor/plugins/baked_light_baker.cpp2
-rw-r--r--tools/editor/plugins/cube_grid_theme_editor_plugin.cpp2
-rw-r--r--tools/editor/plugins/item_list_editor_plugin.cpp4
-rw-r--r--tools/editor/plugins/sample_editor_plugin.cpp2
-rw-r--r--tools/editor/plugins/spatial_editor_plugin.cpp2
-rw-r--r--tools/editor/property_editor.cpp2
11 files changed, 14 insertions, 14 deletions
diff --git a/tools/editor/animation_editor.cpp b/tools/editor/animation_editor.cpp
index b479872510..08b90b5408 100644
--- a/tools/editor/animation_editor.cpp
+++ b/tools/editor/animation_editor.cpp
@@ -3115,7 +3115,7 @@ void AnimationKeyEditor::_query_insert(const InsertData& p_id) {
if (insert_data.size()==1)
insert_confirm->set_text(vformat(TTR("Create NEW track for %s and insert key?"),p_id.query));
else
- insert_confirm->set_text(vformat(TTR("Create %i NEW tracks and insert keys?"),insert_data.size()));
+ insert_confirm->set_text(vformat(TTR("Create %d NEW tracks and insert keys?"),insert_data.size()));
insert_confirm->get_ok()->set_text(TTR("Create"));
insert_confirm->popup_centered_minsize();
diff --git a/tools/editor/code_editor.cpp b/tools/editor/code_editor.cpp
index 24c763a58f..c92b40628c 100644
--- a/tools/editor/code_editor.cpp
+++ b/tools/editor/code_editor.cpp
@@ -216,7 +216,7 @@ void FindReplaceDialog::_replace() {
text_edit->set_v_scroll(vsval);
// text_edit->set_h_scroll(hsval);
- error_label->set_text(vformat(TTR("Replaced %i ocurrence(s)."),rc));
+ error_label->set_text(vformat(TTR("Replaced %d ocurrence(s)."),rc));
//hide();
diff --git a/tools/editor/dependency_editor.cpp b/tools/editor/dependency_editor.cpp
index eeb08e8e45..633a414b07 100644
--- a/tools/editor/dependency_editor.cpp
+++ b/tools/editor/dependency_editor.cpp
@@ -523,7 +523,7 @@ void OrphanResourcesDialog::ok_pressed() {
if (paths.empty())
return;
- delete_confirm->set_text(vformat(TTR("Permanently delete %i item(s)? (No undo!)"),paths.size()));
+ delete_confirm->set_text(vformat(TTR("Permanently delete %d item(s)? (No undo!)"),paths.size()));
delete_confirm->popup_centered_minsize();
}
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index f638f177ec..a198789c65 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -4955,7 +4955,7 @@ Variant EditorNode::drag_files(const Vector<String>& p_files, Control *p_from){
if (p_files.size()>max_files) {
Label* label=memnew( Label );
- label->set_text(vformat(TTR("%i more file(s)"), p_files.size()-max_files));
+ label->set_text(vformat(TTR("%d more file(s)"), p_files.size()-max_files));
files->add_child(label);
}
@@ -4986,7 +4986,7 @@ Variant EditorNode::drag_files_and_dirs(const Vector<String>& p_files, Control *
if (p_files.size()>max_files) {
Label* label=memnew( Label );
- label->set_text(vformat(TTR("%i more file(s) or folder(s)"), p_files.size()-max_files));
+ label->set_text(vformat(TTR("%d more file(s) or folder(s)"), p_files.size()-max_files));
files->add_child(label);
}
diff --git a/tools/editor/io_plugins/editor_mesh_import_plugin.cpp b/tools/editor/io_plugins/editor_mesh_import_plugin.cpp
index 7341ccb99f..9af7d8daa5 100644
--- a/tools/editor/io_plugins/editor_mesh_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_mesh_import_plugin.cpp
@@ -362,7 +362,7 @@ Error EditorMeshImportPlugin::import(const String& p_path, const Ref<ResourceImp
if (mesh->surface_get_name(i)!="")
name=mesh->surface_get_name(i);
else
- name=vformat(TTR("Surface %i"),i+1);
+ name=vformat(TTR("Surface %d"),i+1);
name_map[name]=mesh->surface_get_material(i);
}
@@ -498,7 +498,7 @@ Error EditorMeshImportPlugin::import(const String& p_path, const Ref<ResourceImp
surf_tool->index();
mesh = surf_tool->commit(mesh);
if (name=="")
- name=vformat(TTR("Surface %i"),mesh->get_surface_count()-1);
+ name=vformat(TTR("Surface %d"),mesh->get_surface_count()-1);
mesh->surface_set_name(mesh->get_surface_count()-1,name);
name="";
surf_tool->clear();
diff --git a/tools/editor/plugins/baked_light_baker.cpp b/tools/editor/plugins/baked_light_baker.cpp
index 6023f2567a..b6bb774364 100644
--- a/tools/editor/plugins/baked_light_baker.cpp
+++ b/tools/editor/plugins/baked_light_baker.cpp
@@ -728,7 +728,7 @@ void BakedLightBaker::_make_octree() {
for(int i=0;i<8;i++)
root->children[i]=0;
- EditorProgress ep("bake_octree",vformat(TTR("Parsing %i Triangles:"), triangles.size()),triangles.size());
+ EditorProgress ep("bake_octree",vformat(TTR("Parsing %d Triangles:"), triangles.size()),triangles.size());
for(int i=0;i<triangles.size();i++) {
diff --git a/tools/editor/plugins/cube_grid_theme_editor_plugin.cpp b/tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
index 8dbd383a3b..b6f3db73f7 100644
--- a/tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
+++ b/tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
@@ -256,7 +256,7 @@ void MeshLibraryEditor::_menu_cbk(int p_option) {
if (p.begins_with("/MeshLibrary/item") && p.get_slice_count("/")>=3) {
to_erase = p.get_slice("/",3).to_int();
- cd->set_text(vformat(TTR("Remove item %i?"),to_erase));
+ cd->set_text(vformat(TTR("Remove item %d?"),to_erase));
cd->popup_centered(Size2(300,60));
}
} break;
diff --git a/tools/editor/plugins/item_list_editor_plugin.cpp b/tools/editor/plugins/item_list_editor_plugin.cpp
index 72b39d6e5f..b711e13193 100644
--- a/tools/editor/plugins/item_list_editor_plugin.cpp
+++ b/tools/editor/plugins/item_list_editor_plugin.cpp
@@ -129,7 +129,7 @@ int ItemListOptionButtonPlugin::get_flags() const {
void ItemListOptionButtonPlugin::add_item() {
- ob->add_item( vformat(TTR("Item %i"),ob->get_item_count()));
+ ob->add_item( vformat(TTR("Item %d"),ob->get_item_count()));
_change_notify();
}
@@ -171,7 +171,7 @@ int ItemListPopupMenuPlugin::get_flags() const {
void ItemListPopupMenuPlugin::add_item() {
- pp->add_item( vformat(TTR("Item %i"),pp->get_item_count()));
+ pp->add_item( vformat(TTR("Item %d"),pp->get_item_count()));
_change_notify();
}
diff --git a/tools/editor/plugins/sample_editor_plugin.cpp b/tools/editor/plugins/sample_editor_plugin.cpp
index 733e894bac..3a54273d14 100644
--- a/tools/editor/plugins/sample_editor_plugin.cpp
+++ b/tools/editor/plugins/sample_editor_plugin.cpp
@@ -328,7 +328,7 @@ void SampleEditor::_update_sample() {
return; //bye or unsupported
generate_preview_texture(sample,peakdisplay);
- info_label->set_text(TTR("Length:")+" "+vformat(TTR("%i frames"), sample->get_length())+" ("+String::num(sample->get_length()/(float)sample->get_mix_rate(),2)+" s), "+(sample->get_format()==Sample::FORMAT_PCM16?TTR("16 Bits"):TTR("8 Bits"))+", "+(sample->is_stereo()?TTR("Stereo"):TTR("Mono"))+".");
+ info_label->set_text(TTR("Length:")+" "+vformat(TTR("%d frames"), sample->get_length())+" ("+String::num(sample->get_length()/(float)sample->get_mix_rate(),2)+" s), "+(sample->get_format()==Sample::FORMAT_PCM16?TTR("16 Bits"):TTR("8 Bits"))+", "+(sample->is_stereo()?TTR("Stereo"):TTR("Mono"))+".");
library->add_sample("default",sample);
}
diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp
index fa99a3d335..55485d8c92 100644
--- a/tools/editor/plugins/spatial_editor_plugin.cpp
+++ b/tools/editor/plugins/spatial_editor_plugin.cpp
@@ -1353,7 +1353,7 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) {
scale = Math::stepify(scale,spatial_editor->get_scale_snap());
}
- set_message(vformat(TTR("Scaling to %s\%."),String::num(scale,1)));
+ set_message(vformat(TTR("Scaling to %s%%."),String::num(scale,1)));
scale/=100.0;
Transform r;
diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp
index 587f6f19f0..64dccbe290 100644
--- a/tools/editor/property_editor.cpp
+++ b/tools/editor/property_editor.cpp
@@ -1732,7 +1732,7 @@ CustomPropertyEditor::CustomPropertyEditor() {
add_child(checks20[i]);
checks20[i]->hide();
checks20[i]->connect("pressed",this,"_action_pressed",make_binds(i));
- checks20[i]->set_tooltip(vformat(TTR("Bit %i, val %i."), i, 1<<i));
+ checks20[i]->set_tooltip(vformat(TTR("Bit %d, val %i."), i, 1<<i));
}
text_edit = memnew( TextEdit );