From 75639ba0e834bc80986604b3cfa918ce11de8dc6 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 3 Dec 2019 00:06:00 +0100 Subject: [PATCH 1/3] update: description is a hard requirement, set a default for archive --- fdroidserver/common.py | 1 + 1 file changed, 1 insertion(+) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 7e145519..960a0280 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -145,6 +145,7 @@ default_config = { developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/u/fdroid. ''', + 'archive_description': _('These are the apps that have been archived from the main repo.'), 'archive_older': 0, 'lint_licenses': fdroidserver.lint.APPROVED_LICENSES, } From ddf1f8ea15af5cd365b3e1aa9bbe6155ad77d19b Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 3 Dec 2019 00:06:30 +0100 Subject: [PATCH 2/3] update: make default repo description translatable --- fdroidserver/common.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 960a0280..8a87efcf 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -139,12 +139,12 @@ default_config = { 'repo_url': "https://MyFirstFDroidRepo.org/fdroid/repo", 'repo_name': "My First FDroid Repo Demo", 'repo_icon': "fdroid-icon.png", - 'repo_description': ''' + 'repo_description': _(''' This is a repository of apps to be used with FDroid. Applications in this repository are either official binaries built by the original application - developers, or are binaries built from source by the admin of f-droid.org - using the tools on https://gitlab.com/u/fdroid. - ''', + developers, or are binaries built from source by f-droid.org using the + tools on https://gitlab.com/fdroid. + '''), 'archive_description': _('These are the apps that have been archived from the main repo.'), 'archive_older': 0, 'lint_licenses': fdroidserver.lint.APPROVED_LICENSES, From 492f12a7a8aad2a72f774d6363eb109cdfb830ea Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 3 Dec 2019 00:09:51 +0100 Subject: [PATCH 3/3] nightly: set descriptions for repo and archive --- fdroidserver/nightly.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fdroidserver/nightly.py b/fdroidserver/nightly.py index 6f09aa4d..0a3a8012 100644 --- a/fdroidserver/nightly.py +++ b/fdroidserver/nightly.py @@ -232,9 +232,11 @@ Last updated: {date}'''.format(repo_git_base=repo_git_base, config += "repo_name = '%s'\n" % repo_git_base config += "repo_url = '%s'\n" % repo_url config += "repo_icon = 'icon.png'\n" + config += "repo_description = 'Nightly builds from %s'\n" % git_user_email config += "archive_name = '%s'\n" % (repo_git_base + ' archive') config += "archive_url = '%s'\n" % (repo_base + '/archive') config += "archive_icon = 'icon.png'\n" + config += "archive_description = 'Old nightly builds that have been archived.'\n" config += "archive_older = %i\n" % options.archive_older config += "servergitmirrors = '%s'\n" % servergitmirror config += "keystore = '%s'\n" % KEYSTORE_FILE