From 8a05e45c83a86d5781b255ea966da80f410aa69b Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Mon, 18 Apr 2016 22:47:13 +0200 Subject: Updated JARR GitHub address. Thanks GitHub! --- README.rst | 4 ++-- app.json | 4 ++-- package.json | 4 ++-- src/conf/conf.cfg-sample | 2 +- src/crawler/classic_crawler.py | 2 +- src/notifications/emails.py | 2 +- src/notifications/notifications.py | 2 +- src/runserver.py | 4 ++-- src/web/export.py | 6 +++--- src/web/forms.py | 2 +- src/web/lib/misc_utils.py | 2 +- src/web/models/__init__.py | 2 +- src/web/models/article.py | 2 +- src/web/models/feed.py | 2 +- src/web/models/role.py | 2 +- src/web/models/user.py | 2 +- src/web/templates/about.html | 6 +++--- src/web/translations/fr/LC_MESSAGES/messages.mo | Bin 17338 -> 17292 bytes src/web/translations/fr/LC_MESSAGES/messages.po | 6 +++--- 19 files changed, 28 insertions(+), 28 deletions(-) diff --git a/README.rst b/README.rst index c61647d1..41d82482 100644 --- a/README.rst +++ b/README.rst @@ -5,7 +5,7 @@ JARR Presentation ------------ -`JARR (Just Another RSS Reader) `_ +`JARR (Just Another RSS Reader) `_ is a web-based news aggregator and reader. Main features @@ -48,7 +48,7 @@ Thank you! License ------- -`JARR `_ is under the `GNU Affero General Public License version 3 `_. +`JARR `_ is under the `GNU Affero General Public License version 3 `_. Contact ------- diff --git a/app.json b/app.json index ac308370..d6a79a5c 100644 --- a/app.json +++ b/app.json @@ -6,8 +6,8 @@ "news", "RSS" ], - "repository": "https://github.com/JARR-aggregator/JARR.git", - "logo": "https://raw.githubusercontent.com/JARR-aggregator/JARR/master/web/static/img/logo.png", + "repository": "https://github.com/JARR/JARR.git", + "logo": "https://raw.githubusercontent.com/JARR/JARR/master/web/static/img/logo.png", "scripts": { "postdeploy": "python src/manager.py db_create" }, diff --git a/package.json b/package.json index 00744dc7..da2f2ef3 100644 --- a/package.json +++ b/package.json @@ -6,10 +6,10 @@ "email": "francois.schmidts@gmail.com", "url": "1pxsolidblack.pl" }, - "description": "jarr (Just Another RSS Reader) is a web-based news aggregator.", + "description": "JARR (Just Another RSS Reader) is a web-based news aggregator.", "repository": { "type": "git", - "url": "https://github.com/JARR-aggregator/JARR" + "url": "https://github.com/JARR/JARR" }, "license": "AGPL-3.0", "engines": { diff --git a/src/conf/conf.cfg-sample b/src/conf/conf.cfg-sample index 56bb4500..811bde67 100644 --- a/src/conf/conf.cfg-sample +++ b/src/conf/conf.cfg-sample @@ -17,7 +17,7 @@ database_url = postgres://pgsqluser:pgsqlpwd@127.0.0.1:5432/aggregator [crawler] crawling_method = classic default_max_error = 6 -user_agent = JARR (https://github.com/JARR-aggregator/JARR) +user_agent = JARR (https://github.com/JARR/JARR) api_login = api_passwd = [notification] diff --git a/src/crawler/classic_crawler.py b/src/crawler/classic_crawler.py index ec5b14b8..cd395d0f 100644 --- a/src/crawler/classic_crawler.py +++ b/src/crawler/classic_crawler.py @@ -4,7 +4,7 @@ # jarr - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/JARR-aggregator/JARR/ +# For more information : https://github.com/JARR/JARR # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/src/notifications/emails.py b/src/notifications/emails.py index 5fb5ce01..fad9aa9d 100644 --- a/src/notifications/emails.py +++ b/src/notifications/emails.py @@ -4,7 +4,7 @@ # JARR - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/JARR-aggregator/JARR/ +# For more information : https://github.com/JARR/JARR # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/src/notifications/notifications.py b/src/notifications/notifications.py index 86486074..004b5485 100644 --- a/src/notifications/notifications.py +++ b/src/notifications/notifications.py @@ -4,7 +4,7 @@ # JARR - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/JARR-aggregator/JARR/ +# For more information : https://github.com/JARR/JARR # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/src/runserver.py b/src/runserver.py index 43b46657..0429449f 100755 --- a/src/runserver.py +++ b/src/runserver.py @@ -1,10 +1,10 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- -# jarr - A Web based news aggregator. +# JARR - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/JARR-aggregator/JARR/ +# For more information : https://github.com/JARR/JARR # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/src/web/export.py b/src/web/export.py index 41ee839c..9d9448df 100644 --- a/src/web/export.py +++ b/src/web/export.py @@ -1,10 +1,10 @@ #! /usr/bin/env python #-*- coding: utf-8 -*- -# jarr - A Web based news aggregator. +# JARR - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/JARR-aggregator/JARR/ +# For more information : https://github.com/JARR/JARR # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -57,7 +57,7 @@ def HTML_HEADER(title="jarr", css="./style.css"): HTML_FOOTER = """

This archive has been generated with -jarr. +jarr. A software under AGPLv3 license. You are welcome to copy, modify or redistribute the source code according to the AGPLv3 license.

diff --git a/src/web/forms.py b/src/web/forms.py index d1999b8b..85980791 100644 --- a/src/web/forms.py +++ b/src/web/forms.py @@ -1,7 +1,7 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- -# jarr - A Web based news aggregator. +# JARR - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # # For more information : http://github.com/JARR-aggregator/JARR/ diff --git a/src/web/lib/misc_utils.py b/src/web/lib/misc_utils.py index 92bdde8a..07cb6ed5 100755 --- a/src/web/lib/misc_utils.py +++ b/src/web/lib/misc_utils.py @@ -4,7 +4,7 @@ # JARR - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/JARR-aggregator/JARR +# For more information : https://github.com/JARR/JARR # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/src/web/models/__init__.py b/src/web/models/__init__.py index 260f3263..acec0a93 100644 --- a/src/web/models/__init__.py +++ b/src/web/models/__init__.py @@ -4,7 +4,7 @@ # jarr - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/JARR-aggregator/JARR/ +# For more information : https://github.com/JARR/JARR # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/src/web/models/article.py b/src/web/models/article.py index 0ab35b20..f4314d8b 100644 --- a/src/web/models/article.py +++ b/src/web/models/article.py @@ -4,7 +4,7 @@ # jarr - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/JARR-aggregator/JARR +# For more information : https://github.com/JARR/JARR # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/src/web/models/feed.py b/src/web/models/feed.py index cc734c41..a866ac57 100644 --- a/src/web/models/feed.py +++ b/src/web/models/feed.py @@ -4,7 +4,7 @@ # jarr - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/JARR-aggregator/JARR/ +# For more information : https://github.com/JARR/JARR # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/src/web/models/role.py b/src/web/models/role.py index 028f439e..e8ea4ce9 100644 --- a/src/web/models/role.py +++ b/src/web/models/role.py @@ -4,7 +4,7 @@ # jarr - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/JARR-aggregator/JARR/ +# For more information : https://github.com/JARR/JARR # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/src/web/models/user.py b/src/web/models/user.py index 8ad9440b..96556b98 100644 --- a/src/web/models/user.py +++ b/src/web/models/user.py @@ -4,7 +4,7 @@ # jarr - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/JARR-aggregator/JARR/ +# For more information : https://github.com/JARR/JARR # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/src/web/templates/about.html b/src/web/templates/about.html index 8d042077..1b0db5d7 100644 --- a/src/web/templates/about.html +++ b/src/web/templates/about.html @@ -7,11 +7,11 @@ {{ _('JARR is a news aggregator platform.') }} {{ _('You can easily install JARR on your server.') }} {{ _('Alternatively, you can deploy your own copy using this button:') }}

- https://www.herokucdn.com/deploy/button.png

+ https://www.herokucdn.com/deploy/button.png

{{ _('This software is under AGPLv3 license. You are welcome to copy, modify or - redistribute the source code + redistribute the source code according to the Affero GPL license.') }}

-

{{ _('Found a bug? Report it here.') }}

+

{{ _('Found a bug? Report it here.') }}

{{ _('Help') }}

diff --git a/src/web/translations/fr/LC_MESSAGES/messages.mo b/src/web/translations/fr/LC_MESSAGES/messages.mo index 434275dc..03a45ed8 100644 Binary files a/src/web/translations/fr/LC_MESSAGES/messages.mo and b/src/web/translations/fr/LC_MESSAGES/messages.mo differ diff --git a/src/web/translations/fr/LC_MESSAGES/messages.po b/src/web/translations/fr/LC_MESSAGES/messages.po index 9b6b8c9a..76a76578 100644 --- a/src/web/translations/fr/LC_MESSAGES/messages.po +++ b/src/web/translations/fr/LC_MESSAGES/messages.po @@ -173,19 +173,19 @@ msgstr "" #: src/web/templates/about.html:11 msgid "" "This software is under AGPLv3 license. You are welcome to copy, modify or\n" -" redistribute the source code\n" " according to the Affero GPL license." msgstr "" "Ce logiciel est sous licence AGPLv3. Vous êtes invité à copier, modifier ou " -"redistribuer le code " +"redistribuer le code " "source selon la licence Affero GPL." #: src/web/templates/about.html:14 msgid "" -"Found a bug? Report it here." msgstr "" "Vous avez trouvé un bug? Signalez-le