diff --git a/addons/website_forum/i18n/website_forum.pot b/addons/website_forum/i18n/website_forum.pot index 84dd4e529a3b68bb1fc59de553639010cefa5cf7..42f6f4b8b286617d1b08066dd84a9d957855d90b 100644 --- a/addons/website_forum/i18n/website_forum.pot +++ b/addons/website_forum/i18n/website_forum.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-21 09:20+0000\n" -"PO-Revision-Date: 2015-09-21 09:20+0000\n" +"POT-Creation-Date: 2015-09-24 10:05+0000\n" +"PO-Revision-Date: 2015-09-24 10:05+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -377,7 +377,7 @@ msgstr "" #. module: website_forum #: model:ir.model.fields,help:website_forum.field_forum_forum_allow_share -msgid "After posting the user will be proposed to share its questionor answer on social networks, enabling social network propagationof the forum content." +msgid "After posting the user will be proposed to share its question or answer on social networks, enabling social network propagation of the forum content." msgstr "" #. module: website_forum @@ -667,6 +667,11 @@ msgstr "" msgid "Check available badges" msgstr "" +#. module: website_forum +#: model:ir.model.fields,help:website_forum.field_forum_forum_allow_bump +msgid "Check this box to display a popup for posts older than 10 days without any given answer. The popup will offer to share it on social networks. When shared, a question is bumped at the top of the forum." +msgstr "" + #. module: website_forum #: model:gamification.badge,name:website_forum.badge_p_4 #: model:gamification.challenge,name:website_forum.challenge_chief_commentator @@ -1530,11 +1535,6 @@ msgstr "" msgid "Last activity date" msgstr "" -#. module: website_forum -#: model:ir.model.fields,field_description:website_forum.field_res_users_calendar_last_notif_ack -msgid "Last notification marked as read from base Calendar" -msgstr "" - #. module: website_forum #: model:ir.ui.view,arch_db:website_forum.header msgid "Last updated:" @@ -1912,11 +1912,6 @@ msgstr "" msgid "Posts" msgstr "" -#. module: website_forum -#: model:ir.model.fields,help:website_forum.field_forum_forum_allow_bump -msgid "Posts without answers older than 10 days will display a popupwhen displayed on the website to propose users to share them on social networks, bumping the question at top of the thread." -msgstr "" - #. module: website_forum #: model:ir.ui.view,arch_db:website_forum.new_question msgid "Provide enough details and, if possible, give an example." @@ -2300,7 +2295,7 @@ msgstr "" #. module: website_forum #: model:ir.model.fields,help:website_forum.field_forum_post_bump_date -msgid "Technical field allowing to bump a question. Writing on this field will triggera write on write_date and therefore bump the post. Directly writing on write_dateis currently not supported and this field is a workaround." +msgid "Technical field allowing to bump a question. Writing on this field will trigger a write on write_date and therefore bump the post. Directly writing on write_date is currently not supported and this field is a workaround." msgstr "" #. module: website_forum @@ -2352,7 +2347,7 @@ msgstr "" #. module: website_forum #: model:forum.forum,description:website_forum.forum_help -msgid "This community is for professionals and enthusiasts of our products and services.Share and discuss the best content and new marketing ideas,build your professional profile and become a better marketer together." +msgid "This community is for professionals and enthusiasts of our products and services. Share and discuss the best content and new marketing ideas, build your professional profile and become a better marketer together." msgstr "" #. module: website_forum diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py index 716ebee344a1121fd23bee06ca118102fce08e6a..f238065df1668c630ba611c44acefb22767d23d5 100644 --- a/addons/website_forum/models/forum.py +++ b/addons/website_forum/models/forum.py @@ -51,8 +51,8 @@ class Forum(models.Model): description = fields.Text( 'Description', translate=True, - default='This community is for professionals and enthusiasts of our products and services.' - 'Share and discuss the best content and new marketing ideas,' + default='This community is for professionals and enthusiasts of our products and services. ' + 'Share and discuss the best content and new marketing ideas, ' 'build your professional profile and become a better marketer together.') welcome_message = fields.Html( 'Welcome Message', @@ -85,12 +85,12 @@ class Forum(models.Model): allow_discussion = fields.Boolean('Discussions', default=True) allow_link = fields.Boolean('Links', help="When clicking on the post, it redirects to an external link", default=True) allow_bump = fields.Boolean('Allow Bump', default=True, - help='Posts without answers older than 10 days will display a popup' - 'when displayed on the website to propose users to share them ' - 'on social networks, bumping the question at top of the thread.') + help='Check this box to display a popup for posts older than 10 days ' + 'without any given answer. The popup will offer to share it on social ' + 'networks. When shared, a question is bumped at the top of the forum.') allow_share = fields.Boolean('Sharing Options', default=True, - help='After posting the user will be proposed to share its question' - 'or answer on social networks, enabling social network propagation' + help='After posting the user will be proposed to share its question ' + 'or answer on social networks, enabling social network propagation ' 'of the forum content.') count_posts_waiting_validation = fields.Integer(string="Number of posts waiting for validation", compute='_compute_count_posts_waiting_validation') count_flagged_posts = fields.Integer(string='Number of flagged posts', compute='_compute_count_flagged_posts') @@ -219,8 +219,8 @@ class Post(models.Model): create_uid = fields.Many2one('res.users', string='Created by', select=True, readonly=True) write_date = fields.Datetime('Update on', select=True, readonly=True) bump_date = fields.Datetime('Bumped on', readonly=True, - help="Technical field allowing to bump a question. Writing on this field will trigger" - "a write on write_date and therefore bump the post. Directly writing on write_date" + help="Technical field allowing to bump a question. Writing on this field will trigger " + "a write on write_date and therefore bump the post. Directly writing on write_date " "is currently not supported and this field is a workaround.") write_uid = fields.Many2one('res.users', string='Updated by', select=True, readonly=True) relevancy = fields.Float('Relevance', compute="_compute_relevancy", store=True)