|
 |
a6d6b4 |
From 2646bb88746aa7b1abc715b40fa0a07a865d9576 Mon Sep 17 00:00:00 2001
|
|
|
a6d6b4 |
From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= <matyc@redhat.com>
|
|
|
a6d6b4 |
Date: Wed, 17 Jun 2020 14:30:52 +0200
|
|
|
a6d6b4 |
Subject: [PATCH 1/3] Improve handling of languages.
|
|
|
a6d6b4 |
|
|
|
a6d6b4 |
- fix the Makefile so translations are copied to the right directory in the image
|
|
|
a6d6b4 |
- allow generation of update image with or without translations
|
|
|
a6d6b4 |
- regenerate the create_update_image script with latest argbash
|
|
|
a6d6b4 |
---
|
|
|
a6d6b4 |
Makefile | 6 ++-
|
|
|
a6d6b4 |
create_update_image.sh | 86 ++++++++++++++++++++++++++++--------------
|
|
|
a6d6b4 |
2 files changed, 63 insertions(+), 29 deletions(-)
|
|
|
a6d6b4 |
|
|
|
a6d6b4 |
diff --git a/Makefile b/Makefile
|
|
|
a6d6b4 |
index 2c2059c..dc8e9a0 100644
|
|
|
a6d6b4 |
--- a/Makefile
|
|
|
a6d6b4 |
+++ b/Makefile
|
|
|
a6d6b4 |
@@ -6,6 +6,8 @@ ADDON = org_fedora_oscap
|
|
|
a6d6b4 |
TESTS = tests \
|
|
|
a6d6b4 |
testing_files
|
|
|
a6d6b4 |
|
|
|
a6d6b4 |
+DEFAULT_INSTALL_OF_PO_FILES ?= yes
|
|
|
a6d6b4 |
+
|
|
|
a6d6b4 |
OSVERSION := $(shell grep -o " [0-9]\{1,\}" /etc/redhat-release | sed "s/ //g")
|
|
|
a6d6b4 |
ifeq ($(OSVERSION),7)
|
|
|
a6d6b4 |
PYVERSION = ""
|
|
|
a6d6b4 |
@@ -37,7 +39,9 @@ NUM_PROCS = $$(getconf _NPROCESSORS_ONLN)
|
|
|
a6d6b4 |
install:
|
|
|
a6d6b4 |
mkdir -p $(DESTDIR)$(ADDONDIR)
|
|
|
a6d6b4 |
cp -rv $(ADDON) $(DESTDIR)$(ADDONDIR)
|
|
|
a6d6b4 |
+ifeq ($(DEFAULT_INSTALL_OF_PO_FILES),yes)
|
|
|
a6d6b4 |
$(MAKE) install-po-files
|
|
|
a6d6b4 |
+endif
|
|
|
a6d6b4 |
|
|
|
a6d6b4 |
uninstall:
|
|
|
a6d6b4 |
rm -rfv $(DESTDIR)$(ADDONDIR)
|
|
|
a6d6b4 |
@@ -78,7 +82,7 @@ push-pot: potfile
|
|
|
a6d6b4 |
zanata push $(ZANATA_PUSH_ARGS)
|
|
|
a6d6b4 |
|
|
|
a6d6b4 |
install-po-files:
|
|
|
a6d6b4 |
- $(MAKE) -C po install
|
|
|
a6d6b4 |
+ $(MAKE) -C po install RPM_BUILD_ROOT=$(DESTDIR)
|
|
|
a6d6b4 |
|
|
|
a6d6b4 |
test:
|
|
|
a6d6b4 |
@echo "***Running pylint$(PYVERSION) checks***"
|
|
|
a6d6b4 |
From 7434500bcd94c2c53d61c84a7364493372f7e053 Mon Sep 17 00:00:00 2001
|
|
|
a6d6b4 |
From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= <matyc@redhat.com>
|
|
|
a6d6b4 |
Date: Wed, 17 Jun 2020 14:32:25 +0200
|
|
|
a6d6b4 |
Subject: [PATCH 2/3] Dont use capital letters for the spoke title.
|
|
|
a6d6b4 |
|
|
|
a6d6b4 |
---
|
|
|
a6d6b4 |
org_fedora_oscap/gui/spokes/oscap.glade | 2 +-
|
|
|
a6d6b4 |
po/oscap-anaconda-addon.pot | 4 ++--
|
|
|
a6d6b4 |
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
a6d6b4 |
|
|
|
a6d6b4 |
diff --git a/org_fedora_oscap/gui/spokes/oscap.glade b/org_fedora_oscap/gui/spokes/oscap.glade
|
|
|
a6d6b4 |
index e9e2fc0..e8516c0 100644
|
|
|
a6d6b4 |
--- a/org_fedora_oscap/gui/spokes/oscap.glade
|
|
|
a6d6b4 |
+++ b/org_fedora_oscap/gui/spokes/oscap.glade
|
|
|
a6d6b4 |
@@ -37,7 +37,7 @@
|
|
|
a6d6b4 |
<property name="can_focus">False</property>
|
|
|
a6d6b4 |
<property name="hexpand">True</property>
|
|
|
a6d6b4 |
<property name="vexpand">True</property>
|
|
|
a6d6b4 |
- <property name="window_name" translatable="yes">SECURITY POLICY</property>
|
|
|
a6d6b4 |
+ <property name="window_name" translatable="yes">Security Policy</property>
|
|
|
a6d6b4 |
<signal name="button-clicked" handler="on_back_clicked" swapped="no"/>
|
|
|
a6d6b4 |
<child internal-child="main_box">
|
|
|
a6d6b4 |
<object class="GtkBox" id="AnacondaSpokeWindow-main_box1">
|
|
|
a6d6b4 |
|
|
|
a6d6b4 |
From 00c3dd557881def88c2898fa6ced17dddfef5213 Mon Sep 17 00:00:00 2001
|
|
|
a6d6b4 |
From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= <matyc@redhat.com>
|
|
|
a6d6b4 |
Date: Thu, 18 Jun 2020 15:12:40 +0200
|
|
|
a6d6b4 |
Subject: [PATCH 3/3] Changed URI back to URL in order not to mess with
|
|
|
a6d6b4 |
translations.
|
|
|
a6d6b4 |
|
|
|
a6d6b4 |
The PR #112 marked this string as translatable, and changed it in the process.
|
|
|
a6d6b4 |
However, the string is already present elsewhere in the source code, so this move
|
|
|
a6d6b4 |
messed things up for translators.
|
|
|
a6d6b4 |
|
|
|
a6d6b4 |
This change reverts the URL->URI change, and leaves the GUI string "translatable",
|
|
|
a6d6b4 |
as there is no way how to record the reason for this decision, so the situation doesn't repeat again.
|
|
|
a6d6b4 |
As a result, it is now the job of the translation framework
|
|
|
a6d6b4 |
to deal with the duplication gracefully.
|
|
|
a6d6b4 |
---
|
|
|
a6d6b4 |
org_fedora_oscap/gui/spokes/oscap.glade | 2 +-
|
|
|
a6d6b4 |
po/oscap-anaconda-addon.pot | 9 ++-------
|
|
|
a6d6b4 |
2 files changed, 3 insertions(+), 8 deletions(-)
|
|
|
a6d6b4 |
|
|
|
a6d6b4 |
diff --git a/org_fedora_oscap/gui/spokes/oscap.glade b/org_fedora_oscap/gui/spokes/oscap.glade
|
|
|
a6d6b4 |
index e8516c0..1adcfcf 100644
|
|
|
a6d6b4 |
--- a/org_fedora_oscap/gui/spokes/oscap.glade
|
|
|
a6d6b4 |
+++ b/org_fedora_oscap/gui/spokes/oscap.glade
|
|
|
a6d6b4 |
@@ -446,7 +446,7 @@
|
|
|
a6d6b4 |
<object class="GtkLabel" id="noContentLabel">
|
|
|
a6d6b4 |
<property name="visible">True</property>
|
|
|
a6d6b4 |
<property name="can_focus">False</property>
|
|
|
a6d6b4 |
- <property name="label" translatable="yes">No content found. Please enter data stream content or archive URI below:</property>
|
|
|
a6d6b4 |
+ <property name="label" translatable="yes">No content found. Please enter data stream content or archive URL below:</property>
|
|
|
a6d6b4 |
<property name="wrap">True</property>
|
|
|
a6d6b4 |
<property name="xalign">0</property>
|
|
|
a6d6b4 |
</object>
|