mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-11 23:54:18 +00:00
Code Activity

Minor clean-ups in projucer translation code

Browse source
This commit is contained in:
jules 2017-03-13 17:34:01 +00:00
parent 9c7ee8710a
commit 4fa73d7bb6
2 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
extras/Projucer/Source/Application/jucer_CommandLine.cpp
View file

@ -621,18 +621,16 @@ namespace
{
checkArgumentCount (args, 3);
const String preTranslated = getFileCheckingForExistence (args[1]).loadFileAsString();
const String postTranslated = getFileCheckingForExistence (args[2]).loadFileAsString();
auto preTranslated = getFileCheckingForExistence (args[1]).loadFileAsString();
auto postTranslated = getFileCheckingForExistence (args[2]).loadFileAsString();
const String localisedContent = (args.size() > 3 ? getFileCheckingForExistence (args[3]).loadFileAsString() : String());
const LocalisedStrings localised = LocalisedStrings (localisedContent, false);
auto localisedContent = (args.size() > 3 ? getFileCheckingForExistence (args[3]).loadFileAsString() : String());
auto localised = LocalisedStrings (localisedContent, false);
using TH = TranslationHelpers;
const String out = TH::createFinishedTranslationFile (TH::trimEnd (TH::breakApart (preTranslated)),
TH::trimEnd (TH::breakApart (postTranslated)),
localised);
std::cout << out << std::endl;
std::cout << TH::createFinishedTranslationFile (TH::withTrimmedEnds (TH::breakApart (preTranslated)),
TH::withTrimmedEnds (TH::breakApart (postTranslated)),
localised) << std::endl;
}
//==============================================================================

14
extras/Projucer/Source/Utility/jucer_TranslationHelpers.h
View file

@ -227,18 +227,12 @@ struct TranslationHelpers
return result;
}
static StringArray trimEnd (const StringArray& array)
static StringArray withTrimmedEnds (StringArray array)
{
StringArray result;
result.ensureStorageAllocated (array.size());
for (auto& s : array)
s = s.trimEnd().removeCharacters ("\r\n");
for (int i = 0; i < array.size(); ++i)
{
result.add (array[i].trimEnd()
.replace ("\n", String())
.replace ("\r", String()));
}
return result;
return array;
}
static String escapeString (const String& s)