From 367c4d5aa807839b2106545cf8bc99a274e1a7f4 Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Mon, 10 Oct 2016 07:36:00 +0200 Subject: new name: the last one. --- src/bootstrap.py | 2 +- src/conf.py | 8 +++--- src/conf/conf.cfg-sample | 6 ++-- src/crawler/classic_crawler.py | 4 +-- src/manager.py | 2 +- src/notifications/emails.py | 4 +-- src/notifications/notifications.py | 8 +++--- src/runserver.py | 4 +-- src/web/export.py | 6 ++-- src/web/forms.py | 8 +++--- src/web/js/app.js | 2 +- src/web/js/components/MainApp.react.js | 2 +- src/web/js/components/Navbar.react.js | 8 +++--- src/web/lib/misc_utils.py | 8 +++--- src/web/models/__init__.py | 4 +-- src/web/models/article.py | 4 +-- src/web/models/feed.py | 4 +-- src/web/models/role.py | 4 +-- src/web/models/user.py | 4 +-- src/web/static/css/customized-bootstrap.css | 20 ++++++------- src/web/static/css/one-page-app.css | 2 +- src/web/static/img/jarr.svg | 2 +- src/web/templates/about.html | 14 ++++----- src/web/templates/emails/new_password.txt | 2 +- src/web/templates/home.html | 2 +- src/web/templates/layout.html | 8 +++--- src/web/templates/opml.xml | 2 +- src/web/translations/fr/LC_MESSAGES/messages.mo | Bin 16913 -> 16985 bytes src/web/translations/fr/LC_MESSAGES/messages.po | 36 ++++++++++++------------ src/web/translations/messages.pot | 14 ++++----- src/web/views/api/v3/article.py | 4 +-- src/web/views/api/v3/common.py | 4 +-- src/web/views/api/v3/feed.py | 4 +-- 33 files changed, 103 insertions(+), 103 deletions(-) (limited to 'src') diff --git a/src/bootstrap.py b/src/bootstrap.py index 7b6a6c8c..912c35ae 100644 --- a/src/bootstrap.py +++ b/src/bootstrap.py @@ -25,7 +25,7 @@ from flask_sqlalchemy import SQLAlchemy # Create Flask application application = Flask('web') -if os.environ.get('JARR_TESTING', False) == 'true': +if os.environ.get('Newspipe_TESTING', False) == 'true': application.debug = logging.DEBUG application.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///:memory:' application.config['TESTING'] = True diff --git a/src/conf.py b/src/conf.py index a5b86608..7f276099 100644 --- a/src/conf.py +++ b/src/conf.py @@ -26,20 +26,20 @@ ON_HEROKU = int(os.environ.get('HEROKU', 0)) == 1 DEFAULTS = {"platform_url": "http://www.newspipe.org", "self_registration": "false", "cdn_address": "", - "admin_email": "root@jarr.localhost", + "admin_email": "root@newspipe.localhost", "postmark_api_key": "", "token_validity_period": "3600", "nb_worker": "100", "api_login": "", "api_passwd": "", "default_max_error": "3", - "log_path": "jarr.log", + "log_path": "newspipe.log", "log_level": "info", - "user_agent": "JARR (https://github.com/JARR)", + "user_agent": "Newspipe (https://github.com/Newspipe)", "secret_key": "", "security_password_salt": "", "enabled": "false", - "notification_email": "jarr@no-reply.com", + "notification_email": "newspipe@no-reply.com", "tls": "false", "ssl": "true", "host": "0.0.0.0", diff --git a/src/conf/conf.cfg-sample b/src/conf/conf.cfg-sample index a9e59936..8c8f04bf 100644 --- a/src/conf/conf.cfg-sample +++ b/src/conf/conf.cfg-sample @@ -9,7 +9,7 @@ platform_url = http://127.0.0.1:5000/ admin_email = security_password_salt = a secret to confirm user account token_validity_period = 3600 -log_path = ./src/web/var/jarr.log +log_path = ./src/web/var/newspipe.log nb_worker = 5 log_level = info [database] @@ -17,11 +17,11 @@ 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/JARR) +user_agent = Newspipe (https://github.com/Newspipe/Newspipe) api_login = api_passwd = [notification] -notification_email = JARR@no-reply.com +notification_email = Newspipe@no-reply.com host = smtp.googlemail.com port = 465 tls = false diff --git a/src/crawler/classic_crawler.py b/src/crawler/classic_crawler.py index c3cfb6a3..c124a667 100644 --- a/src/crawler/classic_crawler.py +++ b/src/crawler/classic_crawler.py @@ -1,10 +1,10 @@ #! /usr/bin/env python # -*- coding: utf-8 - -# jarr - A Web based news aggregator. +# newspipe - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/JARR/JARR +# For more information : https://github.com/Newspipe/Newspipe # # 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/manager.py b/src/manager.py index cd656226..155e7c3d 100755 --- a/src/manager.py +++ b/src/manager.py @@ -33,7 +33,7 @@ def db_create(): 'nickname': 'admin', 'pwdhash': generate_password_hash( os.environ.get("ADMIN_PASSWORD", "password")), - 'email': os.environ.get("ADMIN_EMAIL", "root@jarr.localhost")} + 'email': os.environ.get("ADMIN_EMAIL", "root@newspipe.localhost")} with application.app_context(): db.create_all() UserController(ignore_context=True).create(**admin) diff --git a/src/notifications/emails.py b/src/notifications/emails.py index fad9aa9d..479d43cf 100644 --- a/src/notifications/emails.py +++ b/src/notifications/emails.py @@ -1,10 +1,10 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- -# JARR - A Web based news aggregator. +# Newspipe - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/JARR/JARR +# For more information : https://github.com/Newspipe/Newspipe # # 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 004b5485..2f8fc0b8 100644 --- a/src/notifications/notifications.py +++ b/src/notifications/notifications.py @@ -1,10 +1,10 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- -# JARR - A Web based news aggregator. +# Newspipe - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/JARR/JARR +# For more information : https://github.com/Newspipe/Newspipe # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -54,7 +54,7 @@ def new_account_notification(user): expire_time=expire_time) emails.send(to=user.email, bcc=conf.NOTIFICATION_EMAIL, - subject="[JARR] Account creation", plaintext=plaintext) + subject="[Newspipe] Account creation", plaintext=plaintext) def new_password_notification(user, password): """ @@ -64,4 +64,4 @@ def new_password_notification(user, password): user=user, password=password) emails.send(to=user.email, bcc=conf.NOTIFICATION_EMAIL, - subject="[JARR] New password", plaintext=plaintext) + subject="[Newspipe] New password", plaintext=plaintext) diff --git a/src/runserver.py b/src/runserver.py index 92a03667..0768cea8 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. +# Newspipe - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/JARR/JARR +# For more information : https://github.com/Newspipe/Newspipe # # 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 048dc064..98473c9e 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. +# Newspipe - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : https://github.com/JARR/JARR +# For more information : https://github.com/Newspipe/Newspipe # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -27,7 +27,7 @@ __copyright__ = "Copyright (c) Cedric Bonhomme" __license__ = "AGPLv3" # -# This file contains the export functions of jarr. +# This file contains the export functions of newspipe. # from flask import jsonify diff --git a/src/web/forms.py b/src/web/forms.py index a604897e..a1864175 100644 --- a/src/web/forms.py +++ b/src/web/forms.py @@ -1,10 +1,10 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- -# JARR - A Web based news aggregator. +# Newspipe - A Web based news aggregator. # Copyright (C) 2010-2016 Cédric Bonhomme - https://www.cedricbonhomme.org # -# For more information : http://github.com/JARR/JARR +# For more information : http://github.com/Newspipe/Newspipe # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -41,7 +41,7 @@ from web.models import User class SignupForm(Form): """ - Sign up form (registration to jarr). + Sign up form (registration to newspipe). """ nickname = TextField(lazy_gettext("Nickname"), [validators.Required(lazy_gettext("Please enter your nickname."))]) @@ -86,7 +86,7 @@ class RedirectForm(Form): class SigninForm(RedirectForm): """ - Sign in form (connection to jarr). + Sign in form (connection to newspipe). """ email_or_nickmane = TextField("Email or nickname", [validators.Length(min=3, max=35), diff --git a/src/web/js/app.js b/src/web/js/app.js index 00156670..7837e6ae 100644 --- a/src/web/js/app.js +++ b/src/web/js/app.js @@ -14,5 +14,5 @@ var MainApp = require('./components/MainApp.react'); ReactDOM.render( , - document.getElementById('jarrapp') + document.getElementById('newspipeapp') ); diff --git a/src/web/js/components/MainApp.react.js b/src/web/js/components/MainApp.react.js index 6e695b49..8105d32f 100644 --- a/src/web/js/components/MainApp.react.js +++ b/src/web/js/components/MainApp.react.js @@ -10,7 +10,7 @@ var RightPanel = require('./RightPanel.react'); var MainApp = React.createClass({ render: function() { return (
- + diff --git a/src/web/js/components/Navbar.react.js b/src/web/js/components/Navbar.react.js index 67e9ed56..ca2ff27b 100644 --- a/src/web/js/components/Navbar.react.js +++ b/src/web/js/components/Navbar.react.js @@ -70,22 +70,22 @@ JarrNavBar = React.createClass({ this.setState({showModal: true, modalType: 'addCategory'}); }, render: function() { - return ( + return ( {this.getModal()} - JARR + Newspipe

{{ _('Help') }}

-

{{ _('The documentation of the API is here.') }}

+

{{ _('The documentation of the API is here.') }}

{{ _('You can subscribe to new feeds with a bookmarklet. Drag the following button to your browser bookmarks.') }}

- {{ _('Subscribe to this feed using JARR', bookmarklet='javascript:window.location="%s?url="+encodeURIComponent(document.location)' % url_for('feed.bookmarklet', _external=True)) }} + {{ _('Subscribe to this feed using Newspipe', bookmarklet='javascript:window.location="%s?url="+encodeURIComponent(document.location)' % url_for('feed.bookmarklet', _external=True)) }}
{% endblock %} diff --git a/src/web/templates/emails/new_password.txt b/src/web/templates/emails/new_password.txt index 40bdc207..1a04a36d 100644 --- a/src/web/templates/emails/new_password.txt +++ b/src/web/templates/emails/new_password.txt @@ -3,6 +3,6 @@ Hello {{ user.nickname }}, A new password has been generated at your request: {{ password }} -It is advised to replace it as soon as connected to JARR. +It is advised to replace it as soon as connected to Newspipe. See you, diff --git a/src/web/templates/home.html b/src/web/templates/home.html index 64e8140d..fe68861a 100644 --- a/src/web/templates/home.html +++ b/src/web/templates/home.html @@ -4,6 +4,6 @@ {% endblock %} {% block content %} -
+
{% endblock %} diff --git a/src/web/templates/layout.html b/src/web/templates/layout.html index 804ec5d6..3e44c4eb 100644 --- a/src/web/templates/layout.html +++ b/src/web/templates/layout.html @@ -4,9 +4,9 @@ {% block head %} - + - JARR{% if head_titles %} - {{ ' - '.join(head_titles) }}{% endif %} + Newspipe{% if head_titles %} - {{ ' - '.join(head_titles) }}{% endif %} @@ -19,7 +19,7 @@ {% block menu %} -