diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-12-29 14:42:12 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-12-29 14:42:12 +0300 |
commit | 3666ee91326323b7599f5283bd3dd9614f495bc5 (patch) | |
tree | d29d676ebbd142b5dd1b3a8870d4cf1d443ab568 /source/blender/compositor | |
parent | 625381509f7e71483ba9dc0eda9c88153cf7b245 (diff) |
More from T47045: Add i18n translations to render status from compo.
Also fix inconsistency for freestyle translation - we use IFACE_ everywhere
(TIP_ may be more suited, but let's be consistent first!).
Diffstat (limited to 'source/blender/compositor')
5 files changed, 20 insertions, 5 deletions
diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt index 972db6b71d2..9ecbab4dba0 100644 --- a/source/blender/compositor/CMakeLists.txt +++ b/source/blender/compositor/CMakeLists.txt @@ -30,6 +30,7 @@ set(INC operations ../blenkernel ../blenlib + ../blentranslation ../imbuf ../makesdna ../makesrna @@ -551,6 +552,10 @@ data_to_c(${CMAKE_CURRENT_SOURCE_DIR}/operations/COM_OpenCLKernels.cl add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_1_APIS) +if(WITH_INTERNATIONAL) + add_definitions(-DWITH_INTERNATIONAL) +endif() + if(WITH_CYCLES AND WITH_CYCLES_DEBUG) add_definitions(-DWITH_CYCLES_DEBUG) endif() diff --git a/source/blender/compositor/SConscript b/source/blender/compositor/SConscript index b3fe494a25c..ee91c47a531 100644 --- a/source/blender/compositor/SConscript +++ b/source/blender/compositor/SConscript @@ -40,6 +40,7 @@ incs = [ '#/extern/clew/include', '../blenkernel', '../blenlib', + '../blentranslation', '../imbuf', '../makesdna', '../makesrna', @@ -59,6 +60,9 @@ incs = [ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs.append(env['BF_PTHREADS_INC']) +if env['WITH_BF_INTERNATIONAL']: + defs.append('WITH_INTERNATIONAL') + if env['WITH_BF_CYCLES'] and env['WITH_BF_CYCLES_DEBUG']: defs.append('WITH_CYCLES_DEBUG') diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cpp b/source/blender/compositor/intern/COM_ExecutionGroup.cpp index 184c381f42a..e5c2b8ace4e 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.cpp +++ b/source/blender/compositor/intern/COM_ExecutionGroup.cpp @@ -40,6 +40,7 @@ #include "MEM_guardedalloc.h" #include "BLI_math.h" #include "BLI_string.h" +#include "BLT_translation.h" #include "PIL_time.h" #include "WM_api.h" #include "WM_types.h" @@ -402,7 +403,7 @@ void ExecutionGroup::finalizeChunkExecution(int chunkNumber, MemoryBuffer **memo this->m_bTree->progress(this->m_bTree->prh, progress); char buf[128]; - BLI_snprintf(buf, sizeof(buf), "Compositing | Tile %u-%u", + BLI_snprintf(buf, sizeof(buf), IFACE_("Compositing | Tile %u-%u"), this->m_chunksFinished, this->m_numberOfChunks); this->m_bTree->stats_draw(this->m_bTree->sdh, buf); diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.cpp b/source/blender/compositor/intern/COM_ExecutionSystem.cpp index 143528e68b1..2b34a5f9716 100644 --- a/source/blender/compositor/intern/COM_ExecutionSystem.cpp +++ b/source/blender/compositor/intern/COM_ExecutionSystem.cpp @@ -28,6 +28,8 @@ extern "C" { #include "BKE_node.h" } +#include "BLT_translation.h" + #include "COM_Converter.h" #include "COM_NodeOperationBuilder.h" #include "COM_NodeOperation.h" @@ -76,7 +78,7 @@ ExecutionSystem::ExecutionSystem(RenderData *rd, Scene *scene, bNodeTree *editin viewer_border->xmin < viewer_border->xmax && viewer_border->ymin < viewer_border->ymax; - editingtree->stats_draw(editingtree->sdh, "Compositing | Determining resolution"); + editingtree->stats_draw(editingtree->sdh, IFACE_("Compositing | Determining resolution")); for (index = 0; index < this->m_groups.size(); index++) { resolution[0] = 0; @@ -127,7 +129,7 @@ void ExecutionSystem::set_operations(const Operations &operations, const Groups void ExecutionSystem::execute() { const bNodeTree *editingtree = this->m_context.getbNodeTree(); - editingtree->stats_draw(editingtree->sdh, (char *)"Compositing | Initializing execution"); + editingtree->stats_draw(editingtree->sdh, IFACE_("Compositing | Initializing execution")); DebugInfo::execute_started(this); @@ -183,7 +185,7 @@ void ExecutionSystem::execute() WorkScheduler::finish(); WorkScheduler::stop(); - editingtree->stats_draw(editingtree->sdh, (char *)"Compositing | Deinitializing execution"); + editingtree->stats_draw(editingtree->sdh, IFACE_("Compositing | Deinitializing execution")); for (index = 0; index < this->m_operations.size(); index++) { NodeOperation *operation = this->m_operations[index]; operation->deinitExecution(); diff --git a/source/blender/compositor/intern/COM_compositor.cpp b/source/blender/compositor/intern/COM_compositor.cpp index 397540e8e2f..d41bc9648f5 100644 --- a/source/blender/compositor/intern/COM_compositor.cpp +++ b/source/blender/compositor/intern/COM_compositor.cpp @@ -25,6 +25,9 @@ extern "C" { #include "BKE_node.h" #include "BLI_threads.h" } + +#include "BLT_translation.h" + #include "BKE_scene.h" #include "COM_compositor.h" @@ -76,7 +79,7 @@ void COM_execute(RenderData *rd, Scene *scene, bNodeTree *editingtree, int rende /* set progress bar to 0% and status to init compositing */ editingtree->progress(editingtree->prh, 0.0); - editingtree->stats_draw(editingtree->sdh, (char *)"Compositing"); + editingtree->stats_draw(editingtree->sdh, IFACE_("Compositing")); bool twopass = (editingtree->flag & NTREE_TWO_PASS) > 0 && !rendering; /* initialize execution system */ |