Merge pull request #746 from superdesk/master

Merging master into stt

newsroom/agenda/__init__.py

@@ -31,9 +31,6 @@ def init_app(app):
         'google_maps_styles',
         gettext('Google Maps Styles'),
         default='',
-        description=gettext('Provide styles delimited by &(ampersand). '
-                            'For example, feature:poi|element:labels|visibility:off&transit|visibility:off. '
-                            'Refer to https://developers.google.com/maps/documentation/maps-static/styling '
-                            'for more details'),
+        description=gettext('Provide styles delimited by &(ampersand). For example, feature:poi|element:labels|visibility:off&transit|visibility:off. Refer to https://developers.google.com/maps/documentation/maps-static/styling for more details'),  # noqa
         client_setting=True
     )

newsroom/push.py

@@ -76,7 +76,7 @@ def push():
         notify_new_item(agenda, check_topics=True)
     elif item.get('type') == 'text':
         orig = app.data.find_one('wire_search', req=None, _id=item['guid'])
-        item['_id'] = publish_item(item)
+        item['_id'] = publish_item(item, is_new=orig is None)
         notify_new_item(item, check_topics=orig is None)
     elif item['type'] == 'planning_featured':
         publish_planning_featured(item)
@@ -96,7 +96,7 @@ def set_dates(doc):
     doc.setdefault(app.config['VERSION'], 1)
 
 
-def publish_item(doc):
+def publish_item(doc, is_new):
     """Duplicating the logic from content_api.publish service."""
     set_dates(doc)
     doc.setdefault('wordcount', get_word_count(doc.get('body_html', '')))
@@ -123,7 +123,7 @@ def publish_item(doc):
         agenda_items = superdesk.get_resource_service('agenda').set_delivery(doc)
         if agenda_items:
             [notify_new_item(item, check_topics=False) for item in agenda_items]
-    publish_item_signal.send(app._get_current_object(), item=doc)
+    publish_item_signal.send(app._get_current_object(), item=doc, is_new=is_new)
     _id = service.create([doc])[0]
     if 'evolvedfrom' in doc and parent_item:
         service.system_update(parent_item['_id'], {'nextversion': _id}, parent_item)

newsroom/settings.py

@@ -81,8 +81,7 @@ def init_app(app):
     # basic settings
     app.general_setting('google_analytics', gettext('Google Analytics ID'), default=app.config['GOOGLE_ANALYTICS'])
     app.general_setting('company_expiry_alert_recipients', gettext('Company expiry alert recipients'),
-                        description=gettext('Comma separated list of email addresses to '
-                        'which the expiration alerts of companies will be sent to.'))
+                        description=gettext('Comma separated list of email addresses to which the expiration alerts of companies will be sent to.'))  # noqa
 
 
 class SettingsApp():

newsroom/topics/views.py

@@ -26,8 +26,7 @@ def update_topic(id):
     if data.get('notifications'):
         user = get_resource_service('users').find_one(req=None, _id=user_id)
         if not user.get('receive_email'):
-            return "", gettext('Please enable \'Receive notifications via email\' option in '
-                               'your profile to receive topic notifications')
+            return "", gettext('Please enable \'Receive notifications via email\' option in your profile to receive topic notifications')  # noqa
 
     updates = {
         'label': data.get('label'),

pots/newsroom-client.pot

@@ -1541,4 +1541,25 @@ msgstr ""
 
 #: assets/wire/components/WirePreview.jsx:65
 msgid "Follow story"
-msgstr ""
+msgstr ""
+
+msgid "News only filter"
+msgstr ""
+
+msgid "This query defines what is NOT considered 'news' content. It is used by the News only switch to filter the view. When switched on, stories matching this filter will not be displayed."
+msgstr ""
+
+msgid "Time limit for Wire products (in days)"
+msgstr ""
+
+msgid "You can create an additional filter on top of the product definition. The time limit can be enabled for each company in the Permissions."
+msgstr ""
+
+msgid "Comma separated list of email addresses to which the expiration alerts of companies will be sent to."
+msgstr ""
+
+msgid "Provide styles delimited by &(ampersand). For example, feature:poi|element:labels|visibility:off&transit|visibility:off. Refer to https://developers.google.com/maps/documentation/maps-static/styling for more details"
+msgstr ""
+
+msgid "Company expiry alert recipients"
+msgstr ""

pots/newsroom-server.pot

@@ -100,11 +100,7 @@ msgid "Google Maps Styles"
 msgstr ""
 
 #: newsroom/agenda/__init__.py:34
-msgid ""
-"Provide styles delimited by &(ampersand). For example, "
-"feature:poi|element:labels|visibility:off&transit|visibility:off. Refer "
-"to https://developers.google.com/maps/documentation/maps-static/styling "
-"for more details"
+msgid "Provide styles delimited by &(ampersand). For example, feature:poi|element:labels|visibility:off&transit|visibility:off. Refer to https://developers.google.com/maps/documentation/maps-static/styling for more details"
 msgstr ""
 
 #: newsroom/agenda/agenda.py:44
@@ -582,9 +578,7 @@ msgid "On:"
 msgstr ""
 
 #: newsroom/topics/views.py:29
-msgid ""
-"Please enable 'Receive notifications via email' option in your profile to"
-" receive topic notifications"
+msgid "Please enable 'Receive notifications via email' option in your profile to receive topic notifications"
 msgstr ""
 
 #: newsroom/topics/views.py:109 newsroom/wire/views.py:214
@@ -685,24 +679,15 @@ msgid "News only filter"
 msgstr ""
 
 #: newsroom/wire/__init__.py:82
-msgid ""
-"\n"
-"This query defines what is NOT considered \"news\" content.\n"
-"It is used by the News only switch to filter the view.\n"
-"When switched on, stories matching this filter will not be displayed.\n"
-"        "
+msgid "This query defines what is NOT considered 'news' content. It is used by the News only switch to filter the view. When switched on, stories matching this filter will not be displayed."
 msgstr ""
 
 #: newsroom/wire/__init__.py:91
 msgid "Time limit for Wire products (in days)"
 msgstr ""
 
 #: newsroom/wire/__init__.py:95
-msgid ""
-"\n"
-"You can create an additional filter on top of the product definition.\n"
-"The time limit can be enabled for each company in the Permissions.\n"
-"        "
+msgid "You can create an additional filter on top of the product definition. The time limit can be enabled for each company in the Permissions."
 msgstr ""
 
 #: newsroom/wire/__init__.py:117