diff --git a/extras/Projucer/Source/Application/jucer_CommandLine.cpp b/extras/Projucer/Source/Application/jucer_CommandLine.cpp index 825192e221..014cfdf541 100644 --- a/extras/Projucer/Source/Application/jucer_CommandLine.cpp +++ b/extras/Projucer/Source/Application/jucer_CommandLine.cpp @@ -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; } //============================================================================== diff --git a/extras/Projucer/Source/Utility/jucer_TranslationHelpers.h b/extras/Projucer/Source/Utility/jucer_TranslationHelpers.h index be40cb3493..2a943080c3 100644 --- a/extras/Projucer/Source/Utility/jucer_TranslationHelpers.h +++ b/extras/Projucer/Source/Utility/jucer_TranslationHelpers.h @@ -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)