-
-
Notifications
You must be signed in to change notification settings - Fork 76
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[fc] Repository: plone.app.contentrules
Branch: refs/heads/master Date: 2019-03-08T16:10:02+01:00 Author: Mikel Larreategi (erral) <mlarreategi@codesyntax.com> Commit: plone/plone.app.contentrules@7d6678d fix default value for msgid Files changed: M plone/app/contentrules/browser/navigation.py Repository: plone.app.contentrules Branch: refs/heads/master Date: 2019-03-08T16:10:33+01:00 Author: Mikel Larreategi (erral) <mlarreategi@codesyntax.com> Commit: plone/plone.app.contentrules@003663b changelog Files changed: A news/42.bugfix Repository: plone.app.contentrules Branch: refs/heads/master Date: 2019-03-10T22:44:51+01:00 Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> Commit: plone/plone.app.contentrules@ea3d0c3 Merge pull request #43 from plone/issue-42-erral fix default value for msgid Files changed: A news/42.bugfix M plone/app/contentrules/browser/navigation.py
- Loading branch information
Showing
1 changed file
with
19 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,50 +1,48 @@ | ||
| Repository: Products.CMFPlone | ||
| Repository: plone.app.contentrules | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2019-03-08T15:49:26+01:00 | ||
| Date: 2019-03-08T16:10:02+01:00 | ||
| Author: Mikel Larreategi (erral) <mlarreategi@codesyntax.com> | ||
| Commit: https://github.com/plone/Products.CMFPlone/commit/afbc67125342e3b76d6c00a47817e6eb63f002ca | ||
| Commit: https://github.com/plone/plone.app.contentrules/commit/7d6678df2f5c158ee9f81d247efaa38301ebdcb5 | ||
|
|
||
| fix wrong msgids. Fixes #2788 | ||
| fix default value for msgid | ||
|
|
||
| Files changed: | ||
| M Products/CMFPlone/controlpanel/browser/redirects-controlpanel.pt | ||
| M Products/CMFPlone/controlpanel/browser/redirects-manage.pt | ||
| M plone/app/contentrules/browser/navigation.py | ||
|
|
||
| b'diff --git a/Products/CMFPlone/controlpanel/browser/redirects-controlpanel.pt b/Products/CMFPlone/controlpanel/browser/redirects-controlpanel.pt\nindex e458585f8..a117d3401 100644\n--- a/Products/CMFPlone/controlpanel/browser/redirects-controlpanel.pt\n+++ b/Products/CMFPlone/controlpanel/browser/redirects-controlpanel.pt\n@@ -161,7 +161,7 @@\n tal:attributes="class python:error and \'field error\' or \'field\'">\n <label\n for="file"\n- i18n:translate="label_file">\n+ i18n:translate="label_csv_file">\n CSV file\n </label>\n \ndiff --git a/Products/CMFPlone/controlpanel/browser/redirects-manage.pt b/Products/CMFPlone/controlpanel/browser/redirects-manage.pt\nindex 1ae3ba337..617fbac3b 100644\n--- a/Products/CMFPlone/controlpanel/browser/redirects-manage.pt\n+++ b/Products/CMFPlone/controlpanel/browser/redirects-manage.pt\n@@ -22,7 +22,7 @@\n <dt i18n:translate="">\n Info\n </dt>\n- <dd i18n:translate="help_sharing_page_default_page">\n+ <dd i18n:translate="help_aliases">\n You are managing the alternative urls of a default view in a container.\n To manage them for the entire container,\n <a\n' | ||
| b"diff --git a/plone/app/contentrules/browser/navigation.py b/plone/app/contentrules/browser/navigation.py\nindex 7eedc8c..6238959 100644\n--- a/plone/app/contentrules/browser/navigation.py\n+++ b/plone/app/contentrules/browser/navigation.py\n@@ -13,7 +13,7 @@ def breadcrumbs(self):\n 'absolute_url': '{0}/@@rules-controlpanel'.format(portal_url),\n 'Title': _(\n 'title_manage_contentrules',\n- default=u'Content rules',\n+ default=u'Content Rules',\n ),\n },\n {\n" | ||
|
|
||
| Repository: Products.CMFPlone | ||
| Repository: plone.app.contentrules | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2019-03-08T15:50:08+01:00 | ||
| Date: 2019-03-08T16:10:33+01:00 | ||
| Author: Mikel Larreategi (erral) <mlarreategi@codesyntax.com> | ||
| Commit: https://github.com/plone/Products.CMFPlone/commit/3b35fba5359a79da84b9d5ce1a4c66a8ec0f85c9 | ||
| Commit: https://github.com/plone/plone.app.contentrules/commit/003663be9dcbfb31fd20e2b9d7f031c55ab3c93d | ||
|
|
||
| changelog | ||
|
|
||
| Files changed: | ||
| A news/2788.bugfix | ||
| A news/42.bugfix | ||
|
|
||
| b'diff --git a/news/2788.bugfix b/news/2788.bugfix\nnew file mode 100644\nindex 000000000..e3d68b9b4\n--- /dev/null\n+++ b/news/2788.bugfix\n@@ -0,0 +1 @@\n+Fix wrong msgids in link management control panel [erral]\n' | ||
| b'diff --git a/news/42.bugfix b/news/42.bugfix\nnew file mode 100644\nindex 0000000..5b67958\n--- /dev/null\n+++ b/news/42.bugfix\n@@ -0,0 +1 @@\n+Fix default value for a msgid [erral]\n' | ||
|
|
||
| Repository: Products.CMFPlone | ||
| Repository: plone.app.contentrules | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2019-03-10T22:44:03+01:00 | ||
| Date: 2019-03-10T22:44:51+01:00 | ||
| Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> | ||
| Commit: https://github.com/plone/Products.CMFPlone/commit/558493c2184c313076c5fd487c08d47222b75090 | ||
| Commit: https://github.com/plone/plone.app.contentrules/commit/ea3d0c3f4eff99053ec6c705e97e33c93696ae9c | ||
|
|
||
| Merge pull request #2789 from plone/issue-2788-erral | ||
| Merge pull request #43 from plone/issue-42-erral | ||
|
|
||
| Fix wrong msgids in link control panel | ||
| fix default value for msgid | ||
|
|
||
| Files changed: | ||
| A news/2788.bugfix | ||
| M Products/CMFPlone/controlpanel/browser/redirects-controlpanel.pt | ||
| M Products/CMFPlone/controlpanel/browser/redirects-manage.pt | ||
| A news/42.bugfix | ||
| M plone/app/contentrules/browser/navigation.py | ||
|
|
||
| b'diff --git a/Products/CMFPlone/controlpanel/browser/redirects-controlpanel.pt b/Products/CMFPlone/controlpanel/browser/redirects-controlpanel.pt\nindex e458585f8..a117d3401 100644\n--- a/Products/CMFPlone/controlpanel/browser/redirects-controlpanel.pt\n+++ b/Products/CMFPlone/controlpanel/browser/redirects-controlpanel.pt\n@@ -161,7 +161,7 @@\n tal:attributes="class python:error and \'field error\' or \'field\'">\n <label\n for="file"\n- i18n:translate="label_file">\n+ i18n:translate="label_csv_file">\n CSV file\n </label>\n \ndiff --git a/Products/CMFPlone/controlpanel/browser/redirects-manage.pt b/Products/CMFPlone/controlpanel/browser/redirects-manage.pt\nindex 1ae3ba337..617fbac3b 100644\n--- a/Products/CMFPlone/controlpanel/browser/redirects-manage.pt\n+++ b/Products/CMFPlone/controlpanel/browser/redirects-manage.pt\n@@ -22,7 +22,7 @@\n <dt i18n:translate="">\n Info\n </dt>\n- <dd i18n:translate="help_sharing_page_default_page">\n+ <dd i18n:translate="help_aliases">\n You are managing the alternative urls of a default view in a container.\n To manage them for the entire container,\n <a\ndiff --git a/news/2788.bugfix b/news/2788.bugfix\nnew file mode 100644\nindex 000000000..e3d68b9b4\n--- /dev/null\n+++ b/news/2788.bugfix\n@@ -0,0 +1 @@\n+Fix wrong msgids in link management control panel [erral]\n' | ||
| b"diff --git a/news/42.bugfix b/news/42.bugfix\nnew file mode 100644\nindex 0000000..5b67958\n--- /dev/null\n+++ b/news/42.bugfix\n@@ -0,0 +1 @@\n+Fix default value for a msgid [erral]\ndiff --git a/plone/app/contentrules/browser/navigation.py b/plone/app/contentrules/browser/navigation.py\nindex 7eedc8c..6238959 100644\n--- a/plone/app/contentrules/browser/navigation.py\n+++ b/plone/app/contentrules/browser/navigation.py\n@@ -13,7 +13,7 @@ def breadcrumbs(self):\n 'absolute_url': '{0}/@@rules-controlpanel'.format(portal_url),\n 'Title': _(\n 'title_manage_contentrules',\n- default=u'Content rules',\n+ default=u'Content Rules',\n ),\n },\n {\n" | ||
|
|