From 5fedaa16e7185a459ce3d060c0258dff6fb6e109 Mon Sep 17 00:00:00 2001 From: Michael Behrisch Date: Tue, 5 Dec 2023 22:23:56 +0100 Subject: [PATCH] more translatable strings --- src/utils/options/OptionsCont.cpp | 2 +- src/utils/router/AStarRouter.h | 2 +- src/utils/router/CHRouter.h | 4 ++-- src/utils/router/CHRouterWrapper.h | 2 +- src/utils/router/DijkstraRouter.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/utils/options/OptionsCont.cpp b/src/utils/options/OptionsCont.cpp index 61dd6afdf169..cc79fe63b996 100644 --- a/src/utils/options/OptionsCont.cpp +++ b/src/utils/options/OptionsCont.cpp @@ -429,7 +429,7 @@ void OptionsCont::reportDoubleSetting(const std::string& arg) const { std::vector synonymes = getSynonymes(arg); std::ostringstream s; - s << "A value for the option '" + arg + "' was already set.\n Possible synonymes: "; + s << TLF("A value for the option '%' was already set.\n Possible synonymes: ", arg); auto synonym = synonymes.begin(); while (synonym != synonymes.end()) { s << (*synonym); diff --git a/src/utils/router/AStarRouter.h b/src/utils/router/AStarRouter.h index 8a1ef0296af2..0ddc51c676bc 100644 --- a/src/utils/router/AStarRouter.h +++ b/src/utils/router/AStarRouter.h @@ -272,7 +272,7 @@ class AStarRouter : public SUMOAbstractRouter { } #endif if (!silent) { - this->myErrorMsgHandler->informf("No connection between edge '%' and edge '%' found.", from->getID(), to->getID()); + this->myErrorMsgHandler->informf(TL("No connection between edge '%' and edge '%' found."), from->getID(), to->getID()); } return false; } diff --git a/src/utils/router/CHRouter.h b/src/utils/router/CHRouter.h index 5f658db76860..10c10e4a81f9 100644 --- a/src/utils/router/CHRouter.h +++ b/src/utils/router/CHRouter.h @@ -269,7 +269,7 @@ class CHRouter: public SUMOAbstractRouter { virtual void prohibit(const std::vector& toProhibit) { if (toProhibit.size() > 0) { - WRITE_WARNINGF("Routing algorithm CH does not support dynamic closing of edges%", ""); + WRITE_WARNINGF(TL("Routing algorithm CH does not support dynamic closing of edges%"), ""); } } @@ -329,7 +329,7 @@ class CHRouter: public SUMOAbstractRouter { buildPathFromMeeting(meeting, into); } else { if (!silent) { - this->myErrorMsgHandler->informf("No connection between edge '%' and edge '%' found.", from->getID(), to->getID()); + this->myErrorMsgHandler->informf(TL("No connection between edge '%' and edge '%' found."), from->getID(), to->getID()); } result = false; } diff --git a/src/utils/router/CHRouterWrapper.h b/src/utils/router/CHRouterWrapper.h index 143f69b5059e..39a093a8b65e 100644 --- a/src/utils/router/CHRouterWrapper.h +++ b/src/utils/router/CHRouterWrapper.h @@ -82,7 +82,7 @@ class CHRouterWrapper: public SUMOAbstractRouter { virtual void prohibit(const std::vector& toProhibit) { if (toProhibit.size() > 0) { - WRITE_WARNINGF("Routing algorithm CHWrapper does not support dynamic closing of edges%", ""); + WRITE_WARNINGF(TL("Routing algorithm CHWrapper does not support dynamic closing of edges%"), ""); } } diff --git a/src/utils/router/DijkstraRouter.h b/src/utils/router/DijkstraRouter.h index 3b06142f91a8..5ac7ddeb1e90 100644 --- a/src/utils/router/DijkstraRouter.h +++ b/src/utils/router/DijkstraRouter.h @@ -235,7 +235,7 @@ class DijkstraRouter : public SUMOAbstractRouter { std::cout << "visited " + toString(num_visited) + " edges (unsuccessful path length: " + toString(into.size()) + ")\n"; #endif if (to != nullptr && !mySilent && !silent) { - this->myErrorMsgHandler->informf("No connection between edge '%' and edge '%' found.", from->getID(), to->getID()); + this->myErrorMsgHandler->informf(TL("No connection between edge '%' and edge '%' found."), from->getID(), to->getID()); } #ifdef DijkstraRouter_DEBUG_QUERY_VISITED DijkstraRouter_DEBUG_QUERY_VISITED_OUT << " \n\n";