diff --git a/searx/templates/eelo/base.html b/searx/templates/eelo/base.html index 31fb8160f4358a6e05ebfc32e8986f3f94bd752d..94dae554ad56ab34361792c92761be4b6128f9ff 100644 --- a/searx/templates/eelo/base.html +++ b/searx/templates/eelo/base.html @@ -89,7 +89,7 @@ e Foundation 2018-2019, {{ _('Powered by') }} Spot - {{ searx_version }}.
An open-source metasearch engine forked from Searx. + {{ metadata_version }}.
An open-source metasearch engine forked from Searx {{ searx_version }}. {{ _('About') }} {{ _('Privacy') }} diff --git a/searx/version.py b/searx/version.py index 473eb722d04489ddf53a0f4685ec13fc3c231959..11bbcbffe0df864ff2f9066fb03d874f7d9b05dd 100644 --- a/searx/version.py +++ b/searx/version.py @@ -22,3 +22,9 @@ try: VERSION_STRING = get_distribution("searx").version except DistributionNotFound: VERSION_STRING = "0.0.0" + +try: + SEARX_VERSION, METADATA_VERSION = VERSION_STRING.split("+") +except ValueError: + SEARX_VERSION = VERSION_STRING + METADATA_VERSION = "" diff --git a/searx/webapp.py b/searx/webapp.py index fea6046e2a1859409af6ca76b39ed73d402b1473..48ccef9349c9caa6007f13c7f6b14e5e47dde36a 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -52,7 +52,7 @@ from searx.utils import ( get_static_files, get_result_templates, get_themes, gen_useragent, dict_subset, prettify_url, match_language ) -from searx.version import VERSION_STRING +from searx.version import VERSION_STRING, SEARX_VERSION, METADATA_VERSION from searx.languages import language_codes as languages from searx.search import Search from searx.search_database import RedisCache @@ -333,7 +333,8 @@ def render(template_name, override_theme=None, **kwargs): if locale in rtl_locales and 'rtl' not in kwargs: kwargs['rtl'] = True - kwargs['searx_version'] = VERSION_STRING + kwargs['searx_version'] = SEARX_VERSION + kwargs['metadata_version'] = METADATA_VERSION kwargs['method'] = request.preferences.get_value('method')