Mercurial > kallithea

changeset 7865:8691b8bedb3e default-i18n

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge default to default-i18n
author Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
date Mon, 02 Sep 2019 20:46:13 +0200
parents 12f36f3afc56 (current diff) a22352f81a3e (diff)
children 2d8796af8cc8
files
diffstat 21 files changed, 73 insertions(+), 60 deletions(-) [+]
line wrap: on
line diff
--- 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$
--- 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 <daniel@dattrix.com> 2014
     Henrik Stuart <hg@hstuart.dk> 2014
     Ingo von Borstel <kallithea@planetmaker.de> 2014
+    invision70 <invision70@gmail.com> 2014
     Jelmer Vernooij <jelmer@samba.org> 2014
     Jim Hague <jim.hague@acm.org> 2014
     Matt Fellows <kallithea@matt-fellows.me.uk> 2014
     Max Roman <max@choloclos.se> 2014
     Na'Tosha Bard <natosha@unity3d.com> 2014
     Rasmus Selsmark <rasmuss@unity3d.com> 2014
+    SkryabinD <skryabind@gmail.com> 2014
     Tim Freund <tim@freunds.net> 2014
     Travis Burtrum <android@moparisthebest.com> 2014
+    whosaysni <whosaysni@gmail.com> 2014
     Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> 2014
     Marcin Kuźmiński <marcin@python-works.com> 2010-2013
+    Nemcio <areczek01@gmail.com> 2012-2013
     xpol <xpolife@gmail.com> 2012-2013
+    Andrey Mivrenik <myvrenik@gmail.com> 2013
     Aparkar <aparkar@icloud.com> 2013
+    ArcheR <aleclitvinov1980@gmail.com> 2013
     Dennis Brakhane <brakhane@googlemail.com> 2013
+    gnustavo <gustavo@gnustavo.com> 2013
     Grzegorz Rożniecki <xaerxess@gmail.com> 2013
     Ilya Beda <ir4y.ix@gmail.com> 2013
+    ivlevdenis <ivlevdenis.ru@gmail.com> 2013
     Jonathan Sternberg <jonathansternberg@gmail.com> 2013
     Leonardo Carneiro <leonardo@unity3d.com> 2013
     Magnus Ericmats <magnus.ericmats@gmail.com> 2013
     Martin Vium <martinv@unity3d.com> 2013
+    Mikhail Zholobov <legal90@gmail.com> 2013
+    mokeev1995 <mokeev_andre@mail.ru> 2013
+    Ruslan Bekenev <furyinbox@gmail.com> 2013
+    shirou - しろう 2013
     Simon Lopez <simon.lopez@slopez.org> 2013
+    softforwinxp <softforwinxp@gmail.com> 2013
+    stephanj <info@stephan-jauernick.de> 2013
     Ton Plomp <tcplomp@gmail.com> 2013
+    zhmylove <zhmylove@narod.ru> 2013
+    こいんとす <tkondou@gmail.com> 2013
     Augusto Herrmann <augusto.herrmann@planejamento.gov.br> 2011-2012
+    Augusto Herrmann <augusto.herrmann@gmail.com> 2012
     Dan Sheridan <djs@adelard.com> 2012
     Dies Koper <diesk@fast.au.fujitsu.com> 2012
     Erwin Kroon <e.kroon@smartmetersolutions.nl> 2012
     H Waldo G <gwaldo@gmail.com> 2012
     hppj <hppj@postmage.biz> 2012
     Indra Talip <indra.talip@gmail.com> 2012
-    mikespook 2012
+    mikespook <mikespook@gmail.com> 2012
     nansenat16 <nansenat16@null.tw> 2012
+    Nemcio <bogdan114@g.pl> 2012
     Philip Jameson <philip.j@hostdime.com> 2012
     Raoul Thill <raoul.thill@gmail.com> 2012
     Stefan Engel <mail@engel-stefan.de> 2012
--- 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::
--- 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()
--- 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 <EMAIL@ADDRESS>, 2017.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: Kallithea 0.3.99\n"
--- 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 <info@stephan-jauernick.de>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Kallithea 0.3\n"
--- 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 <EMAIL@ADDRESS>, 2016.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: Kallithea 0.3\n"
--- 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 <EMAIL@ADDRESS>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: Kallithea 0.3\n"
--- 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 <EMAIL@ADDRESS>, 2011
-# こいんとす <tkondou@gmail.com>, 2013
-# Takumi IINO <trot.thunder@gmail.com>, 2013
-# whosaysni <whosaysni@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Kallithea 0.3\n"
--- 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 <EMAIL@ADDRESS>, 2017.
 #
 msgid ""
 msgstr ""
--- 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 <areczek01@gmail.com>, 2013
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010
-# marcinkuzminski <marcin@python-blog.com>, 2013
-# Nemcio <bogdan114@g.pl>, 2012
-# Nemcio <areczek01@gmail.com>, 2012-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Kallithea 0.3\n"
--- 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 <augusto.herrmann@gmail.com>, 2012
-# gnustavo <gustavo@gnustavo.com>, 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 <marcin@python-blog.com>\n"
+"Last-Translator: Marcin Kuźmiński <marcin@python-works.com>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
 "kallithea/kallithea/pt_BR/>\n"
 "Language: pt_BR\n"
--- 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 <aleclitvinov1980@gmail.com>, 2013
-# mokeev1995 <mokeev_andre@mail.ru>, 2013
-# Andrey Mivrenik <myvrenik@gmail.com>, 2013
-# invision70 <invision70@gmail.com>, 2014
-# ivlevdenis <ivlevdenis.ru@gmail.com>, 2013
-# Mikhail Zholobov <legal90@gmail.com>, 2013
-# Ruslan Bekenev <furyinbox@gmail.com>, 2013
-# SkryabinD <skryabind@gmail.com>, 2014
-# softforwinxp <softforwinxp@gmail.com>, 2013
-# zhmylove <zhmylove@narod.ru>, 2013
-# Andrej Shadura <andrew@shadura.me>, 2015, 2016.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: Kallithea 0.3\n"
--- 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 <EMAIL@ADDRESS>, 2017.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: Kallithea 0.3.2\n"
--- 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 <EMAIL@ADDRESS>, 2011
-# mikespook <mikespook@gmail.com>, 2012
-# xpol <xpolife@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: Kallithea 0.3\n"
--- 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 <EMAIL@ADDRESS>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: Kallithea 0.3\n"
--- 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:
--- 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)
 
--- 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 @@
   <li>Copyright &copy; 2014, Daniel Anderson</li>
   <li>Copyright &copy; 2014, Henrik Stuart</li>
   <li>Copyright &copy; 2014, Ingo von Borstel</li>
+  <li>Copyright &copy; 2014, invision70</li>
   <li>Copyright &copy; 2014, Jelmer Vernooij</li>
   <li>Copyright &copy; 2014, Jim Hague</li>
   <li>Copyright &copy; 2014, Matt Fellows</li>
   <li>Copyright &copy; 2014, Max Roman</li>
   <li>Copyright &copy; 2014, Na'Tosha Bard</li>
   <li>Copyright &copy; 2014, Rasmus Selsmark</li>
+  <li>Copyright &copy; 2014, SkryabinD</li>
   <li>Copyright &copy; 2014, Tim Freund</li>
   <li>Copyright &copy; 2014, Travis Burtrum</li>
+  <li>Copyright &copy; 2014, whosaysni</li>
   <li>Copyright &copy; 2014, Zoltan Gyarmati</li>
   <li>Copyright &copy; 2010&ndash;2013, Marcin Kuźmiński</li>
   <li>Copyright &copy; 2010&ndash;2013, RhodeCode GmbH</li>
   <li>Copyright &copy; 2011, 2013, Aparkar</li>
+  <li>Copyright &copy; 2012&ndash;2013, Nemcio</li>
   <li>Copyright &copy; 2012&ndash;2013, xpol</li>
+  <li>Copyright &copy; 2013, Andrey Mivrenik</li>
+  <li>Copyright &copy; 2013, ArcheR</li>
   <li>Copyright &copy; 2013, Dennis Brakhane</li>
+  <li>Copyright &copy; 2013, gnustavo</li>
   <li>Copyright &copy; 2013, Grzegorz Rożniecki</li>
   <li>Copyright &copy; 2013, Ilya Beda</li>
+  <li>Copyright &copy; 2013, ivlevdenis</li>
   <li>Copyright &copy; 2013, Jonathan Sternberg</li>
   <li>Copyright &copy; 2013, Leonardo Carneiro</li>
   <li>Copyright &copy; 2013, Magnus Ericmats</li>
   <li>Copyright &copy; 2013, Martin Vium</li>
+  <li>Copyright &copy; 2013, Mikhail Zholobov</li>
+  <li>Copyright &copy; 2013, mokeev1995</li>
+  <li>Copyright &copy; 2013, Ruslan Bekenev</li>
+  <li>Copyright &copy; 2013, shirou - しろう</li>
   <li>Copyright &copy; 2013, Simon Lopez</li>
+  <li>Copyright &copy; 2013, softforwinxp</li>
+  <li>Copyright &copy; 2013, stephanj</li>
+  <li>Copyright &copy; 2013, zhmylove</li>
+  <li>Copyright &copy; 2013, こいんとす</li>
   <li>Copyright &copy; 2011&ndash;2012, Augusto Herrmann</li>
   <li>Copyright &copy; 2012, Dan Sheridan</li>
   <li>Copyright &copy; 2012, H Waldo G</li>
--- 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 <mao@lins.fju.edu.tw>'] = "Ching-Chen Mao <mao@lins.fju.edu.tw>"
 name_fixes['marcink'] = "Marcin Kuźmiński <marcin@python-works.com>"
 name_fixes['Marcin Kuzminski'] = "Marcin Kuźmiński <marcin@python-works.com>"
+name_fixes['mikespook'] = "mikespook <mikespook@gmail.com>"
 name_fixes['nansenat16@null.tw'] = "nansenat16 <nansenat16@null.tw>"
 name_fixes['Peter Vitt'] = "Peter Vitt <petervitt@web.de>"
 name_fixes['philip.j@hostdime.com'] = "Philip Jameson <philip.j@hostdime.com>"
@@ -68,6 +69,28 @@
     # Work folded into commits attributed to others:
     ('2013', 'Ilya Beda <ir4y.ix@gmail.com>'),
     ('2015', 'Bradley M. Kuhn <bkuhn@sfconservancy.org>'),
+    # Translators previously listed in
+    # kallithea/i18n/*/LC_MESSAGES/kallithea.po and originating from before the
+    # use of Weblate.
+    ('2012', 'Augusto Herrmann <augusto.herrmann@gmail.com>'),
+    ('2012', 'Nemcio <areczek01@gmail.com>'),
+    ('2012', 'Nemcio <bogdan114@g.pl>'),
+    ('2013', 'Andrey Mivrenik <myvrenik@gmail.com>'),
+    ('2013', 'ArcheR <aleclitvinov1980@gmail.com>'),
+    ('2013', 'gnustavo <gustavo@gnustavo.com>'),
+    ('2013', 'ivlevdenis <ivlevdenis.ru@gmail.com>'),
+    ('2013', 'Mikhail Zholobov <legal90@gmail.com>'),
+    ('2013', 'mokeev1995 <mokeev_andre@mail.ru>'),
+    ('2013', 'Nemcio <areczek01@gmail.com>'),
+    ('2013', 'Ruslan Bekenev <furyinbox@gmail.com>'),
+    ('2013', 'shirou - しろう'),
+    ('2013', 'softforwinxp <softforwinxp@gmail.com>'),
+    ('2013', 'stephanj <info@stephan-jauernick.de>'),
+    ('2013', 'zhmylove <zhmylove@narod.ru>'),
+    ('2013', 'こいんとす <tkondou@gmail.com>'),
+    ('2014', 'invision70 <invision70@gmail.com>'),
+    ('2014', 'SkryabinD <skryabind@gmail.com>'),
+    ('2014', 'whosaysni <whosaysni@gmail.com>'),
 ]
 
 # Preserve contributors listed in about.html but not appearing in repository
--- 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",