diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2017-12-13 19:17:48 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2017-12-22 22:39:39 +0100 |
| commit | 101a79cc4d13a1f566c1b97c1329813eb7c61bcf (patch) | |
| tree | 31bba77cc8656d6882992ea753917adc787241a9 /avmedia | |
| parent | a5fe3117e1877fa0bfb55f1cf22cf9394b3f0795 (diff) | |
lokdialog: Allow switching language of some of the ResMgr's.
This way, it is possible to have all the strings translated in dialogs even
when different users use different languages. [It was already possible
to have different languages previously, but not everything in the dialog has
switched - like the buttons at the bottom of the dialogs etc.]
Change-Id: I29a5ae6d31a370eec60397884200b684ec1bf5b9
Reviewed-on: https://gerrit.libreoffice.org/46417
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/46979
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/Library_avmedia.mk | 1 | ||||
| -rw-r--r-- | avmedia/source/framework/mediamisc.cxx | 33 | ||||
| -rw-r--r-- | avmedia/source/inc/mediamisc.hxx | 7 |
3 files changed, 1 insertions, 40 deletions
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk index ff206228a0c5..1f4c5246b651 100644 --- a/avmedia/Library_avmedia.mk +++ b/avmedia/Library_avmedia.mk @@ -64,7 +64,6 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\ avmedia/source/framework/mediacontrol \ avmedia/source/framework/MediaControlBase \ avmedia/source/framework/mediaitem \ - avmedia/source/framework/mediamisc \ avmedia/source/framework/mediaplayer \ avmedia/source/framework/mediatoolbox \ avmedia/source/framework/soundhandler \ diff --git a/avmedia/source/framework/mediamisc.cxx b/avmedia/source/framework/mediamisc.cxx deleted file mode 100644 index a8d627266596..000000000000 --- a/avmedia/source/framework/mediamisc.cxx +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <unotools/resmgr.hxx> -#include <mediamisc.hxx> - -namespace avmedia { - -const std::locale& GetResLocale() -{ - static std::locale loc = Translate::Create("avmedia"); - return loc; -} - -} // namespace avmedia - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx index 46d513fa4817..2c45b58775dc 100644 --- a/avmedia/source/inc/mediamisc.hxx +++ b/avmedia/source/inc/mediamisc.hxx @@ -41,14 +41,9 @@ // Mime types #define AVMEDIA_MIMETYPE_COMMON "application/vnd.sun.star.media" -namespace avmedia -{ - const std::locale& GetResLocale(); -} - inline OUString AvmResId(const char* pId) { - return Translate::get(pId, ::avmedia::GetResLocale()); + return Translate::get(pId, Translate::Create("avmedia")); } #endif |