# HG changeset patch # User Thomas De Schampheleire # Date 1567449973 -7200 # Node ID 8691b8bedb3e6c0f23b3c8c6a85a868ce0b4f235 # Parent 12f36f3afc5675960d6eed5ff443bd7b66e52c53# Parent a22352f81a3e4f024068e95ec27dbb9ef795de51 merge default to default-i18n diff -r 12f36f3afc56 -r 8691b8bedb3e .hgignore --- a/.hgignore Sat Aug 24 21:47:47 2019 +0200 +++ b/.hgignore Mon Sep 02 20:46:13 2019 +0200 @@ -24,6 +24,7 @@ ^\.coverage$ ^kallithea/front-end/node_modules$ ^kallithea/front-end/package-lock\.json$ +^kallithea/front-end/theme\.less$ ^kallithea/front-end/tmp$ ^kallithea/public/codemirror$ ^kallithea/public/css/select2-spinner\.gif$ @@ -41,7 +42,6 @@ ^kallithea/public/js/jquery\.flot\.time\.js$ ^kallithea/public/js/jquery\.min\.js$ ^kallithea/public/js/select2\.js$ -^theme\.less$ ^kallithea\.db$ ^test\.db$ ^Kallithea\.egg-info$ diff -r 12f36f3afc56 -r 8691b8bedb3e CONTRIBUTORS --- a/CONTRIBUTORS Sat Aug 24 21:47:47 2019 +0200 +++ b/CONTRIBUTORS Mon Sep 02 20:46:13 2019 +0200 @@ -83,36 +83,54 @@ Daniel Anderson 2014 Henrik Stuart 2014 Ingo von Borstel 2014 + invision70 2014 Jelmer Vernooij 2014 Jim Hague 2014 Matt Fellows 2014 Max Roman 2014 Na'Tosha Bard 2014 Rasmus Selsmark 2014 + SkryabinD 2014 Tim Freund 2014 Travis Burtrum 2014 + whosaysni 2014 Zoltan Gyarmati 2014 Marcin Kuźmiński 2010-2013 + Nemcio 2012-2013 xpol 2012-2013 + Andrey Mivrenik 2013 Aparkar 2013 + ArcheR 2013 Dennis Brakhane 2013 + gnustavo 2013 Grzegorz Rożniecki 2013 Ilya Beda 2013 + ivlevdenis 2013 Jonathan Sternberg 2013 Leonardo Carneiro 2013 Magnus Ericmats 2013 Martin Vium 2013 + Mikhail Zholobov 2013 + mokeev1995 2013 + Ruslan Bekenev 2013 + shirou - しろう 2013 Simon Lopez 2013 + softforwinxp 2013 + stephanj 2013 Ton Plomp 2013 + zhmylove 2013 + こいんとす 2013 Augusto Herrmann 2011-2012 + Augusto Herrmann 2012 Dan Sheridan 2012 Dies Koper 2012 Erwin Kroon 2012 H Waldo G 2012 hppj 2012 Indra Talip 2012 - mikespook 2012 + mikespook 2012 nansenat16 2012 + Nemcio 2012 Philip Jameson 2012 Raoul Thill 2012 Stefan Engel 2012 diff -r 12f36f3afc56 -r 8691b8bedb3e docs/usage/customization.rst --- a/docs/usage/customization.rst Sat Aug 24 21:47:47 2019 +0200 +++ b/docs/usage/customization.rst Mon Sep 02 20:46:13 2019 +0200 @@ -23,10 +23,11 @@ Kallithea uses `Bootstrap 3`_ and Less_ for its style definitions. If you want to make some customizations, we recommend to do so by creating a ``theme.less`` -file. When you create a file named ``theme.less`` in the Kallithea root -directory, you can use this file to override the default style. For example, -you can use this to override ``@kallithea-theme-main-color``, -``@kallithea-logo-url`` or other `Bootstrap variables`_. +file. When you create a file named ``theme.less`` in directory +``kallithea/front-end/`` inside the Kallithea installation, you can use this +file to override the default style. For example, you can use this to override +``@kallithea-theme-main-color``, ``@kallithea-logo-url`` or other `Bootstrap +variables`_. After creating the ``theme.less`` file, you need to regenerate the CSS files, by running:: diff -r 12f36f3afc56 -r 8691b8bedb3e kallithea/controllers/root.py --- a/kallithea/controllers/root.py Sat Aug 24 21:47:47 2019 +0200 +++ b/kallithea/controllers/root.py Mon Sep 02 20:46:13 2019 +0200 @@ -28,7 +28,8 @@ # inheriting from its RoutedController class. class RootController(RoutedController, BaseController): - mapper = make_map(config) + def __init__(self): + self.mapper = make_map(config) - # the following assignment hooks in error handling - error = ErrorController() + # the following assignment hooks in error handling + self.error = ErrorController() diff -r 12f36f3afc56 -r 8691b8bedb3e kallithea/i18n/da/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/da/LC_MESSAGES/kallithea.po Sat Aug 24 21:47:47 2019 +0200 +++ b/kallithea/i18n/da/LC_MESSAGES/kallithea.po Mon Sep 02 20:46:13 2019 +0200 @@ -1,8 +1,6 @@ # Translations template for Kallithea. # Copyright (C) 2017 Various authors, licensing as GPLv3 # This file is distributed under the same license as the Kallithea project. -# FIRST AUTHOR , 2017. -# msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3.99\n" diff -r 12f36f3afc56 -r 8691b8bedb3e kallithea/i18n/de/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po Sat Aug 24 21:47:47 2019 +0200 +++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po Mon Sep 02 20:46:13 2019 +0200 @@ -1,8 +1,6 @@ # German translations for Kallithea. # Copyright (C) 2014 RhodeCode GmbH, and others. # This file is distributed under the same license as the Kallithea project. -# Translators: -# stephanj , 2013 msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" diff -r 12f36f3afc56 -r 8691b8bedb3e kallithea/i18n/es/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/es/LC_MESSAGES/kallithea.po Sat Aug 24 21:47:47 2019 +0200 +++ b/kallithea/i18n/es/LC_MESSAGES/kallithea.po Mon Sep 02 20:46:13 2019 +0200 @@ -1,8 +1,6 @@ # Spanish translations for Kallithea. # Copyright (C) 2016 Various authors, licensing as GPLv3 # This file is distributed under the same license as the Kallithea project. -# FIRST AUTHOR , 2016. -# msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" diff -r 12f36f3afc56 -r 8691b8bedb3e kallithea/i18n/fr/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Sat Aug 24 21:47:47 2019 +0200 +++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Mon Sep 02 20:46:13 2019 +0200 @@ -1,8 +1,6 @@ # French translations for Kallithea. # Copyright (C) 2014 RhodeCode GmbH, and others. # This file is distributed under the same license as the Kallithea project. -# Translators: -# FIRST AUTHOR , 2011 msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" diff -r 12f36f3afc56 -r 8691b8bedb3e kallithea/i18n/ja/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Sat Aug 24 21:47:47 2019 +0200 +++ b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po Mon Sep 02 20:46:13 2019 +0200 @@ -1,13 +1,6 @@ # Japanese translations for Kallithea. # Copyright (C) 2014 RhodeCode GmbH, and others. # This file is distributed under the same license as the Kallithea project. -# Translators: -# しろう, 2013 -# shirou - しろう, 2013 -# FIRST AUTHOR , 2011 -# こいんとす , 2013 -# Takumi IINO , 2013 -# whosaysni , 2014 msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" diff -r 12f36f3afc56 -r 8691b8bedb3e kallithea/i18n/nb_NO/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/nb_NO/LC_MESSAGES/kallithea.po Sat Aug 24 21:47:47 2019 +0200 +++ b/kallithea/i18n/nb_NO/LC_MESSAGES/kallithea.po Mon Sep 02 20:46:13 2019 +0200 @@ -1,7 +1,6 @@ # Translations template for Kallithea. # Copyright (C) 2017 Various authors, licensing as GPLv3 # This file is distributed under the same license as the Kallithea project. -# FIRST AUTHOR , 2017. # msgid "" msgstr "" diff -r 12f36f3afc56 -r 8691b8bedb3e kallithea/i18n/pl/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Sat Aug 24 21:47:47 2019 +0200 +++ b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po Mon Sep 02 20:46:13 2019 +0200 @@ -1,12 +1,6 @@ # Polish translations for Kallithea. # Copyright (C) 2014 RhodeCode GmbH, and others. # This file is distributed under the same license as the Kallithea project. -# Translators: -# Nemcio , 2013 -# FIRST AUTHOR , 2010 -# marcinkuzminski , 2013 -# Nemcio , 2012 -# Nemcio , 2012-2013 msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" diff -r 12f36f3afc56 -r 8691b8bedb3e kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Sat Aug 24 21:47:47 2019 +0200 +++ b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po Mon Sep 02 20:46:13 2019 +0200 @@ -1,16 +1,13 @@ # Portuguese (Brazil) translations for Kallithea. # Copyright (C) 2014 RhodeCode GmbH, and others. # This file is distributed under the same license as the Kallithea project. -# Translators: -# Augusto Herrmann , 2012 -# gnustavo , 2013 msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" "POT-Creation-Date: 2019-05-04 21:13+0200\n" "PO-Revision-Date: 2014-02-13 14:34+0000\n" -"Last-Translator: marcinkuzminski \n" +"Last-Translator: Marcin Kuźmiński \n" "Language-Team: Portuguese (Brazil) \n" "Language: pt_BR\n" diff -r 12f36f3afc56 -r 8691b8bedb3e kallithea/i18n/ru/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Sat Aug 24 21:47:47 2019 +0200 +++ b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po Mon Sep 02 20:46:13 2019 +0200 @@ -1,19 +1,6 @@ # Russian translations for Kallithea. # Copyright (C) 2014 RhodeCode GmbH, and others. # This file is distributed under the same license as the Kallithea project. -# Translators: -# ArcheR , 2013 -# mokeev1995 , 2013 -# Andrey Mivrenik , 2013 -# invision70 , 2014 -# ivlevdenis , 2013 -# Mikhail Zholobov , 2013 -# Ruslan Bekenev , 2013 -# SkryabinD , 2014 -# softforwinxp , 2013 -# zhmylove , 2013 -# Andrej Shadura , 2015, 2016. -# msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" diff -r 12f36f3afc56 -r 8691b8bedb3e kallithea/i18n/uk/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/uk/LC_MESSAGES/kallithea.po Sat Aug 24 21:47:47 2019 +0200 +++ b/kallithea/i18n/uk/LC_MESSAGES/kallithea.po Mon Sep 02 20:46:13 2019 +0200 @@ -1,8 +1,6 @@ # Translations template for Kallithea. # Copyright (C) 2017 Various authors, licensing as GPLv3 # This file is distributed under the same license as the Kallithea project. -# FIRST AUTHOR , 2017. -# msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3.2\n" diff -r 12f36f3afc56 -r 8691b8bedb3e kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Sat Aug 24 21:47:47 2019 +0200 +++ b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Mon Sep 02 20:46:13 2019 +0200 @@ -1,10 +1,6 @@ # Chinese (China) translations for Kallithea. # Copyright (C) 2014 RhodeCode GmbH, and others. # This file is distributed under the same license as the Kallithea project. -# Translators: -# FIRST AUTHOR , 2011 -# mikespook , 2012 -# xpol , 2012 msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" diff -r 12f36f3afc56 -r 8691b8bedb3e kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po Sat Aug 24 21:47:47 2019 +0200 +++ b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po Mon Sep 02 20:46:13 2019 +0200 @@ -1,8 +1,6 @@ # Chinese (Taiwan) translations for Kallithea. # Copyright (C) 2014 RhodeCode GmbH, and others. # This file is distributed under the same license as the Kallithea project. -# Translators: -# FIRST AUTHOR , 2011 msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" diff -r 12f36f3afc56 -r 8691b8bedb3e kallithea/lib/celerylib/__init__.py --- a/kallithea/lib/celerylib/__init__.py Sat Aug 24 21:47:47 2019 +0200 +++ b/kallithea/lib/celerylib/__init__.py Mon Sep 02 20:46:13 2019 +0200 @@ -102,7 +102,7 @@ def locked_task(func): def __wrapper(func, *fargs, **fkwargs): lockkey = __get_lockkey(func, *fargs, **fkwargs) - lockkey_path = config['tg.cache_dir'] # The configured cache_dir is only available under this name ... + lockkey_path = config.get('cache_dir') or config['app_conf']['cache_dir'] # Backward compatibility for TurboGears < 2.4 log.info('running task with lockkey %s', lockkey) try: diff -r 12f36f3afc56 -r 8691b8bedb3e kallithea/lib/celerylib/tasks.py --- a/kallithea/lib/celerylib/tasks.py Sat Aug 24 21:47:47 2019 +0200 +++ b/kallithea/lib/celerylib/tasks.py Mon Sep 02 20:46:13 2019 +0200 @@ -73,7 +73,7 @@ DBS = celerylib.get_session() lockkey = celerylib.__get_lockkey('get_commits_stats', repo_name, ts_min_y, ts_max_y) - lockkey_path = config['tg.cache_dir'] # The configured cache_dir is only available under this name ... + lockkey_path = config.get('cache_dir') or config['app_conf']['cache_dir'] # Backward compatibility for TurboGears < 2.4 log.info('running task with lockkey %s', lockkey) diff -r 12f36f3afc56 -r 8691b8bedb3e kallithea/templates/about.html --- a/kallithea/templates/about.html Sat Aug 24 21:47:47 2019 +0200 +++ b/kallithea/templates/about.html Mon Sep 02 20:46:13 2019 +0200 @@ -106,27 +106,43 @@
  • Copyright © 2014, Daniel Anderson
  • Copyright © 2014, Henrik Stuart
  • Copyright © 2014, Ingo von Borstel
    • +
  • Copyright © 2014, invision70
  • Copyright © 2014, Jelmer Vernooij
  • Copyright © 2014, Jim Hague
  • Copyright © 2014, Matt Fellows
  • Copyright © 2014, Max Roman
  • Copyright © 2014, Na'Tosha Bard
  • Copyright © 2014, Rasmus Selsmark
    • +
  • Copyright © 2014, SkryabinD
  • Copyright © 2014, Tim Freund
  • Copyright © 2014, Travis Burtrum
    • +
  • Copyright © 2014, whosaysni
  • Copyright © 2014, Zoltan Gyarmati
  • Copyright © 2010–2013, Marcin Kuźmiński
  • Copyright © 2010–2013, RhodeCode GmbH
  • Copyright © 2011, 2013, Aparkar
    • +
  • Copyright © 2012–2013, Nemcio
  • Copyright © 2012–2013, xpol
    • +
  • Copyright © 2013, Andrey Mivrenik
    • +
  • Copyright © 2013, ArcheR
  • Copyright © 2013, Dennis Brakhane
    • +
  • Copyright © 2013, gnustavo
  • Copyright © 2013, Grzegorz Rożniecki
  • Copyright © 2013, Ilya Beda
    • +
  • Copyright © 2013, ivlevdenis
  • Copyright © 2013, Jonathan Sternberg
  • Copyright © 2013, Leonardo Carneiro
  • Copyright © 2013, Magnus Ericmats
  • Copyright © 2013, Martin Vium
    • +
  • Copyright © 2013, Mikhail Zholobov
    • +
  • Copyright © 2013, mokeev1995
    • +
  • Copyright © 2013, Ruslan Bekenev
    • +
  • Copyright © 2013, shirou - しろう
  • Copyright © 2013, Simon Lopez
    • +
  • Copyright © 2013, softforwinxp
    • +
  • Copyright © 2013, stephanj
    • +
  • Copyright © 2013, zhmylove
    • +
  • Copyright © 2013, こいんとす
  • Copyright © 2011–2012, Augusto Herrmann
  • Copyright © 2012, Dan Sheridan
  • Copyright © 2012, H Waldo G
    • diff -r 12f36f3afc56 -r 8691b8bedb3e scripts/contributor_data.py --- a/scripts/contributor_data.py Sat Aug 24 21:47:47 2019 +0200 +++ b/scripts/contributor_data.py Mon Sep 02 20:46:13 2019 +0200 @@ -30,6 +30,7 @@ name_fixes['mao '] = "Ching-Chen Mao " name_fixes['marcink'] = "Marcin Kuźmiński " name_fixes['Marcin Kuzminski'] = "Marcin Kuźmiński " +name_fixes['mikespook'] = "mikespook " name_fixes['nansenat16@null.tw'] = "nansenat16 " name_fixes['Peter Vitt'] = "Peter Vitt " name_fixes['philip.j@hostdime.com'] = "Philip Jameson " @@ -68,6 +69,28 @@ # Work folded into commits attributed to others: ('2013', 'Ilya Beda '), ('2015', 'Bradley M. Kuhn '), + # Translators previously listed in + # kallithea/i18n/*/LC_MESSAGES/kallithea.po and originating from before the + # use of Weblate. + ('2012', 'Augusto Herrmann '), + ('2012', 'Nemcio '), + ('2012', 'Nemcio '), + ('2013', 'Andrey Mivrenik '), + ('2013', 'ArcheR '), + ('2013', 'gnustavo '), + ('2013', 'ivlevdenis '), + ('2013', 'Mikhail Zholobov '), + ('2013', 'mokeev1995 '), + ('2013', 'Nemcio '), + ('2013', 'Ruslan Bekenev '), + ('2013', 'shirou - しろう'), + ('2013', 'softforwinxp '), + ('2013', 'stephanj '), + ('2013', 'zhmylove '), + ('2013', 'こいんとす '), + ('2014', 'invision70 '), + ('2014', 'SkryabinD '), + ('2014', 'whosaysni '), ] # Preserve contributors listed in about.html but not appearing in repository diff -r 12f36f3afc56 -r 8691b8bedb3e setup.py --- a/setup.py Sat Aug 24 21:47:47 2019 +0200 +++ b/setup.py Mon Sep 02 20:46:13 2019 +0200 @@ -43,9 +43,9 @@ "alembic >= 0.8.0, < 1.1", "gearbox < 1", "waitress >= 0.8.8, < 1.4", - "WebOb >= 1.7, < 1.8", # turbogears2 2.3.12 requires WebOb<1.8.0 + "WebOb >= 1.7, < 1.9", "backlash >= 0.1.2, < 1", - "TurboGears2 >= 2.3.10, < 2.4", # TODO: 2.4 drops Pylons compatibility + "TurboGears2 >= 2.3.10, < 2.5", "tgext.routes >= 0.2.0, < 1", "Beaker >= 1.7.0, < 2", "WebHelpers >= 1.3, < 1.4",