From c66a2e3eba05d0508d96f6bc23bbcd27f65d621b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Thu, 29 Feb 2024 16:28:27 -0800 Subject: [PATCH 1/2] Application: don't duplicate accel handling (#298) --- src/Application.vala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Application.vala b/src/Application.vala index e8061b44..d517391d 100644 --- a/src/Application.vala +++ b/src/Application.vala @@ -94,7 +94,6 @@ namespace Switchboard { add_action (back_action); add_action (quit_action); - set_accels_for_action ("app.back", {"Left", "Back"}); set_accels_for_action ("app.quit", {"q"}); back_action.activate.connect (action_navigate_back); @@ -138,7 +137,7 @@ namespace Switchboard { navigation_button = new Gtk.Button.with_label (_(all_settings_label)); navigation_button.action_name = "app.back"; navigation_button.set_tooltip_markup ( - Granite.markup_accel_tooltip (get_accels_for_action (navigation_button.action_name)) + Granite.markup_accel_tooltip ({"Left", "Back"}) ); navigation_button.get_style_context ().add_class ("back-button"); From a7a0b507577484229fe59701a2b2f56d2b04eab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Fri, 1 Mar 2024 09:16:55 -0800 Subject: [PATCH 2/2] Update gettext.yml --- .github/workflows/gettext.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gettext.yml b/.github/workflows/gettext.yml index 628e3f6f..22db604a 100644 --- a/.github/workflows/gettext.yml +++ b/.github/workflows/gettext.yml @@ -22,7 +22,7 @@ jobs: token: ${{ secrets.GIT_USER_TOKEN }} - name: Update Translation Files - uses: elementary/actions/gettext-template@next + uses: elementary/actions/gettext-template@main env: GIT_USER_TOKEN: ${{ secrets.GIT_USER_TOKEN }} GIT_USER_NAME: "elementaryBot"