From 72ac9a792a45b63bbc9f3dc284c389f4a4b3a525 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Fri, 17 Sep 2021 22:20:58 +0200 Subject: Fix tests to work when current desktop is the same as the one tested --- tests/tst_utils.cpp | 8 ++++++++ tests/tst_utils.vala | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/tests/tst_utils.cpp b/tests/tst_utils.cpp index 9216b1f..c6b82fb 100644 --- a/tests/tst_utils.cpp +++ b/tests/tst_utils.cpp @@ -29,6 +29,7 @@ public: void SetUp() { unsetenv("XDG_CURRENT_DESKTOP"); + unsetenv("DESKTOP_SESSION"); } void TearDown() { @@ -38,6 +39,7 @@ public: TEST_F(XdgCurrentDesktopUtilsTest, isLomiri) { + unsetenv("XDG_CURRENT_DESKTOP"); EXPECT_FALSE(ayatana_common_utils_is_lomiri()); setenv("XDG_CURRENT_DESKTOP", "Lomiri", 1); EXPECT_TRUE(ayatana_common_utils_is_lomiri()); @@ -45,36 +47,42 @@ TEST_F(XdgCurrentDesktopUtilsTest, isLomiri) TEST_F(XdgCurrentDesktopUtilsTest, isGnome) { + unsetenv("XDG_CURRENT_DESKTOP"); EXPECT_FALSE(ayatana_common_utils_is_gnome()); setenv("XDG_CURRENT_DESKTOP", "GNOME", 1); EXPECT_TRUE(ayatana_common_utils_is_gnome()); } TEST_F(XdgCurrentDesktopUtilsTest, isUnity) { + unsetenv("XDG_CURRENT_DESKTOP"); EXPECT_FALSE(ayatana_common_utils_is_unity()); setenv("XDG_CURRENT_DESKTOP", "Unity", 1); EXPECT_TRUE(ayatana_common_utils_is_unity()); } TEST_F(XdgCurrentDesktopUtilsTest, isMate) { + unsetenv("XDG_CURRENT_DESKTOP"); EXPECT_FALSE(ayatana_common_utils_is_mate()); setenv("XDG_CURRENT_DESKTOP", "MATE", 1); EXPECT_TRUE(ayatana_common_utils_is_mate()); } TEST_F(XdgCurrentDesktopUtilsTest, isXfce) { + unsetenv("XDG_CURRENT_DESKTOP"); EXPECT_FALSE(ayatana_common_utils_is_xfce()); setenv("XDG_CURRENT_DESKTOP", "XFCE", 1); EXPECT_TRUE(ayatana_common_utils_is_xfce()); } TEST_F(XdgCurrentDesktopUtilsTest, isPantheon) { + unsetenv("XDG_CURRENT_DESKTOP"); EXPECT_FALSE(ayatana_common_utils_is_pantheon()); setenv("XDG_CURRENT_DESKTOP", "PANTHEON", 1); EXPECT_TRUE(ayatana_common_utils_is_pantheon()); } TEST_F(XdgCurrentDesktopUtilsTest, isBudgie) { + unsetenv("XDG_CURRENT_DESKTOP"); EXPECT_FALSE(ayatana_common_utils_is_budgie()); setenv("XDG_CURRENT_DESKTOP", "Budgie:GNOME", 1); EXPECT_TRUE(ayatana_common_utils_is_budgie()); diff --git a/tests/tst_utils.vala b/tests/tst_utils.vala index 78b2c2e..a7a624b 100644 --- a/tests/tst_utils.vala +++ b/tests/tst_utils.vala @@ -5,33 +5,39 @@ using GLib; static int main(string[] args) { assert(args.length == 2); + unset_variable("DESKTOP_SESSION"); unset_variable("XDG_CURRENT_DESKTOP"); - assert(! utils_is_lomiri()); set_variable("XDG_CURRENT_DESKTOP", "Lomiri", true); assert(utils_is_lomiri()); + unset_variable("XDG_CURRENT_DESKTOP"); assert(! utils_is_gnome()); set_variable("XDG_CURRENT_DESKTOP", "GNOME", true); assert(utils_is_gnome()); + unset_variable("XDG_CURRENT_DESKTOP"); assert(! utils_is_unity()); set_variable("XDG_CURRENT_DESKTOP", "Unity", true); assert(utils_is_unity()); + unset_variable("XDG_CURRENT_DESKTOP"); assert(! utils_is_mate()); set_variable("XDG_CURRENT_DESKTOP", "MATE", true); assert(utils_is_mate()); + unset_variable("XDG_CURRENT_DESKTOP"); assert(! utils_is_xfce()); set_variable("XDG_CURRENT_DESKTOP", "XFCE", true); assert(utils_is_xfce()); + unset_variable("XDG_CURRENT_DESKTOP"); assert(! utils_is_pantheon()); set_variable("XDG_CURRENT_DESKTOP", "PANTHEON", true); assert(utils_is_pantheon()); + unset_variable("XDG_CURRENT_DESKTOP"); assert(! utils_is_budgie()); set_variable("XDG_CURRENT_DESKTOP", "Budgie:GNOME", true); assert(utils_is_budgie()); -- cgit v1.2.3 From aee6034817b95f76eaca724900e27f55b9e83739 Mon Sep 17 00:00:00 2001 From: Wellington Terumi Uemura Date: Thu, 23 Sep 2021 14:22:40 +0000 Subject: Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (2 of 2 strings) Translation: Ayatana Indicators/Ayatana Common Library Translate-URL: https://hosted.weblate.org/projects/ayatana-indicators/libayatana-common/pt_BR/ --- po/pt_BR.po | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 359d1c5..3c9bdea 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8,21 +8,26 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-17 14:13+0200\n" -"PO-Revision-Date: 2021-06-12 01:32+0200\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" +"PO-Revision-Date: 2021-09-24 14:40+0000\n" +"Last-Translator: Wellington Terumi Uemura \n" +"Language-Team: Portuguese (Brazil) \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ASCII\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 4.9-dev\n" #: ../data/org.ayatana.common.gschema.xml.in:1 msgid "Maximum menu text length" -msgstr "" +msgstr "Comprimento máximo do texto do menu" #: ../data/org.ayatana.common.gschema.xml.in:2 msgid "" "The number of characters to show in dynamic menu items before the text is " "ellipsized. Set to 0 to leave unchanged." msgstr "" +"A quantidade dos caracteres que serão mostrados nos itens do menu dinâmico " +"antes de se aplicar reticências no texto . Defina como 0 para deixar como " +"está." -- cgit v1.2.3