summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKalev Lember <klember@redhat.com>2019-05-17 13:29:15 +0200
committerKalev Lember <klember@redhat.com>2019-05-17 13:35:55 +0200
commit5c410e5354e61904d532bab8aeeab1837cfbe035 (patch)
treebcc517da925d2c1e568307192280dcd7949c3829
parent0ce2e0b8e8d2dd9be986a7fced0450aa71f181bd (diff)
downloadappstream-glib-wip/kalev/do-not-require-translation-tag.tar.gz
Do not require <translation> for validation unless strictwip/kalev/do-not-require-translation-tag
Flathub is already patching appstream-glib to remove this check. Fixes https://github.com/hughsie/appstream-glib/issues/302
-rw-r--r--libappstream-glib/as-app-validate.c4
-rw-r--r--libappstream-glib/as-self-test.c8
2 files changed, 4 insertions, 8 deletions
diff --git a/libappstream-glib/as-app-validate.c b/libappstream-glib/as-app-validate.c
index a8b4b74..197ab40 100644
--- a/libappstream-glib/as-app-validate.c
+++ b/libappstream-glib/as-app-validate.c
@@ -1199,7 +1199,7 @@ as_app_validate (AsApp *app, guint32 flags, GError **error)
gboolean require_url = TRUE;
gboolean require_content_license = TRUE;
gboolean require_name = TRUE;
- gboolean require_translation = TRUE;
+ gboolean require_translation = FALSE;
gboolean require_content_rating = FALSE;
gboolean require_name_shorter_than_summary = FALSE;
gboolean validate_license = TRUE;
@@ -1241,7 +1241,6 @@ as_app_validate (AsApp *app, guint32 flags, GError **error)
number_para_max = 20;
number_para_min = 1;
require_sentence_case = FALSE;
- require_translation = FALSE;
require_content_rating = FALSE;
switch (as_format_get_kind (format)) {
case AS_FORMAT_KIND_METAINFO:
@@ -1264,6 +1263,7 @@ as_app_validate (AsApp *app, guint32 flags, GError **error)
require_sentence_case = TRUE;
require_name_shorter_than_summary = TRUE;
require_contactdetails = TRUE;
+ require_translation = TRUE;
number_para_min = 2;
number_para_max = 4;
}
diff --git a/libappstream-glib/as-self-test.c b/libappstream-glib/as-self-test.c
index ce00247..1de3d3d 100644
--- a/libappstream-glib/as-self-test.c
+++ b/libappstream-glib/as-self-test.c
@@ -2295,8 +2295,6 @@ as_test_app_validate_file_bad_func (void)
"<release> has no version");
as_test_app_validate_check (probs, AS_PROBLEM_KIND_ATTRIBUTE_MISSING,
"<release> has no timestamp");
- as_test_app_validate_check (probs, AS_PROBLEM_KIND_TAG_MISSING,
- "<translation> not specified");
as_test_app_validate_check (probs, AS_PROBLEM_KIND_TAG_INVALID,
"<release> versions are not in order");
as_test_app_validate_check (probs, AS_PROBLEM_KIND_TAG_INVALID,
@@ -2305,7 +2303,7 @@ as_test_app_validate_file_bad_func (void)
"<release> timestamp is in the future");
as_test_app_validate_check (probs, AS_PROBLEM_KIND_MARKUP_INVALID,
"<id> has invalid character");
- g_assert_cmpint (probs->len, ==, 22);
+ g_assert_cmpint (probs->len, ==, 21);
/* again, harder */
probs2 = as_app_validate (app, AS_APP_VALIDATE_FLAG_STRICT, &error);
@@ -2497,14 +2495,12 @@ as_test_app_validate_style_func (void)
as_test_app_validate_check (probs, AS_PROBLEM_KIND_TAG_MISSING,
"<url> is not present");
as_test_app_validate_check (probs, AS_PROBLEM_KIND_TAG_MISSING,
- "<translation> not specified");
- as_test_app_validate_check (probs, AS_PROBLEM_KIND_TAG_MISSING,
"<content_rating> required");
as_test_app_validate_check (probs, AS_PROBLEM_KIND_TAG_MISSING,
"<release> required");
as_test_app_validate_check (probs, AS_PROBLEM_KIND_TAG_MISSING,
"<description> required");
- g_assert_cmpint (probs->len, ==, 13);
+ g_assert_cmpint (probs->len, ==, 12);
}
static void