From f1cf70b6eb2de45745eef36a67b6871224070f56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Capypara=20K=C3=B6pcke?= Date: Mon, 30 Oct 2023 19:16:45 +0100 Subject: [PATCH] xgettext compatibility: Output 'yes' for translatable --- .gitlab-ci.yml | 2 +- blueprintcompiler/outputs/xml/__init__.py | 2 +- tests/samples/accessibility.ui | 2 +- tests/samples/action_widgets.ui | 8 ++++---- tests/samples/adw_alertdialog_responses.ui | 4 ++-- tests/samples/adw_breakpoint.ui | 2 +- tests/samples/adw_messagedialog_responses.ui | 4 ++-- tests/samples/combo_box_text.ui | 2 +- tests/samples/comments.ui | 2 +- tests/samples/menu.ui | 2 +- tests/samples/scale_marks.ui | 2 +- tests/samples/string_list.ui | 2 +- tests/samples/translated.ui | 4 ++-- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bcac278..1ec071e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ build: - ninja -C _build docs/en - git clone https://gitlab.gnome.org/jwestman/blueprint-regression-tests.git - cd blueprint-regression-tests - - git checkout 71522af3607e08143671ee0d224e65e9b9eb9f30 + - git checkout 5f9e155c1333e84e6f683cdb26b02a5925fd8db3 - ./test.sh - cd .. coverage: '/TOTAL.*\s([.\d]+)%/' diff --git a/blueprintcompiler/outputs/xml/__init__.py b/blueprintcompiler/outputs/xml/__init__.py index 22ca9e4..f10fadf 100644 --- a/blueprintcompiler/outputs/xml/__init__.py +++ b/blueprintcompiler/outputs/xml/__init__.py @@ -150,7 +150,7 @@ class XmlOutput(OutputFormat): elif isinstance(translated, QuotedLiteral): return {} else: - return {"translatable": "true", "context": translated.translate_context} + return {"translatable": "yes", "context": translated.translate_context} def _emit_signal(self, signal: Signal, xml: XmlEmitter): name = signal.name diff --git a/tests/samples/accessibility.ui b/tests/samples/accessibility.ui index 7732a14..1482164 100644 --- a/tests/samples/accessibility.ui +++ b/tests/samples/accessibility.ui @@ -8,7 +8,7 @@ corresponding .blp file and regenerate this file with blueprint-compiler. - Hello, world! + Hello, world! my_label 1 diff --git a/tests/samples/action_widgets.ui b/tests/samples/action_widgets.ui index ac730a2..c0d304d 100644 --- a/tests/samples/action_widgets.ui +++ b/tests/samples/action_widgets.ui @@ -9,17 +9,17 @@ corresponding .blp file and regenerate this file with blueprint-compiler. - Cancel + Cancel - Reinstall Windows + Reinstall Windows - Ok + Ok @@ -31,7 +31,7 @@ corresponding .blp file and regenerate this file with blueprint-compiler. - Ok + Ok diff --git a/tests/samples/adw_alertdialog_responses.ui b/tests/samples/adw_alertdialog_responses.ui index 0418751..1b8bb0d 100644 --- a/tests/samples/adw_alertdialog_responses.ui +++ b/tests/samples/adw_alertdialog_responses.ui @@ -8,8 +8,8 @@ corresponding .blp file and regenerate this file with blueprint-compiler. - Cancel - Discard + Cancel + Discard Save diff --git a/tests/samples/adw_breakpoint.ui b/tests/samples/adw_breakpoint.ui index f667958..29cbf9b 100644 --- a/tests/samples/adw_breakpoint.ui +++ b/tests/samples/adw_breakpoint.ui @@ -9,7 +9,7 @@ corresponding .blp file and regenerate this file with blueprint-compiler. max-width: 600px - Hello, world! + Hello, world! false diff --git a/tests/samples/adw_messagedialog_responses.ui b/tests/samples/adw_messagedialog_responses.ui index 48122ca..6cbf5ef 100644 --- a/tests/samples/adw_messagedialog_responses.ui +++ b/tests/samples/adw_messagedialog_responses.ui @@ -8,8 +8,8 @@ corresponding .blp file and regenerate this file with blueprint-compiler. - Cancel - Discard + Cancel + Discard Save diff --git a/tests/samples/combo_box_text.ui b/tests/samples/combo_box_text.ui index c160d80..8a38fe8 100644 --- a/tests/samples/combo_box_text.ui +++ b/tests/samples/combo_box_text.ui @@ -9,7 +9,7 @@ corresponding .blp file and regenerate this file with blueprint-compiler. Hello, world! - Hello! + Hello! item diff --git a/tests/samples/comments.ui b/tests/samples/comments.ui index bd3378a..9f7e004 100644 --- a/tests/samples/comments.ui +++ b/tests/samples/comments.ui @@ -8,7 +8,7 @@ corresponding .blp file and regenerate this file with blueprint-compiler. - Test + Test false diff --git a/tests/samples/menu.ui b/tests/samples/menu.ui index 71c3fd2..a59b8d2 100644 --- a/tests/samples/menu.ui +++ b/tests/samples/menu.ui @@ -12,7 +12,7 @@ corresponding .blp file and regenerate this file with blueprint-compiler. test section - test translated item + test translated item test item shorthand 1 diff --git a/tests/samples/scale_marks.ui b/tests/samples/scale_marks.ui index 36956f5..c08afb4 100644 --- a/tests/samples/scale_marks.ui +++ b/tests/samples/scale_marks.ui @@ -9,7 +9,7 @@ corresponding .blp file and regenerate this file with blueprint-compiler. - Hello, world! + Hello, world! diff --git a/tests/samples/string_list.ui b/tests/samples/string_list.ui index 74de992..a21d747 100644 --- a/tests/samples/string_list.ui +++ b/tests/samples/string_list.ui @@ -9,7 +9,7 @@ corresponding .blp file and regenerate this file with blueprint-compiler. Hello, world! - Hello! + Hello! diff --git a/tests/samples/translated.ui b/tests/samples/translated.ui index 66102a0..4afeddd 100644 --- a/tests/samples/translated.ui +++ b/tests/samples/translated.ui @@ -7,9 +7,9 @@ corresponding .blp file and regenerate this file with blueprint-compiler. - Hello, world! + Hello, world! - Hello + Hello