Merge branch '11.1' into 'master'11.1

add upstream 11.1

See merge request opensource-tracking/FreeFileSync!25

1 files changed, 4 insertions, 9 deletions

diff --git a/zen/i18n.h b/zen/i18n.h
index a70649fe..160b9625 100644
--- a/zen/i18n.h
+++ b/zen/i18n.h
@@ -57,26 +57,21 @@ std::shared_ptr<const TranslationHandler> getTranslator();
 //######################## implementation ##############################
 namespace impl
 {
-inline
-FunStatGlobal<const TranslationHandler>& refGlobalTranslationHandler()
-{
-    //getTranslator() may be called even after static objects of this translation unit are destroyed!
-    static FunStatGlobal<const TranslationHandler> inst; //external linkage even in header!
-    return inst;
-}
+//getTranslator() may be called even after static objects of this translation unit are destroyed!
+inline constinit2 Global<const TranslationHandler> globalTranslationHandler;
 }
 
 inline
 std::shared_ptr<const TranslationHandler> getTranslator()
 {
-    return impl::refGlobalTranslationHandler().get();
+    return impl::globalTranslationHandler.get();
 }
 
 
 inline
 void setTranslator(std::unique_ptr<const TranslationHandler>&& newHandler)
 {
-    impl::refGlobalTranslationHandler().set(std::move(newHandler));
+    impl::globalTranslationHandler.set(std::move(newHandler));
 }