From 4e25198ec298732409217321be10e1e06be2fcbd Mon Sep 17 00:00:00 2001 From: Juan Catalano Date: Sun, 24 Mar 2013 22:48:23 -0700 Subject: Fixed #20104 -- Changed VersionDirective in order to avoid ambiguity. As explained in ticket #20104, the use of versionchanged/versionadded was confusing. To solve this ambiguity these directives no longer accept a second argument but now they only receive the version number (1st arg) and then a content with the proper comment. --- docs/internals/contributing/writing-documentation.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/internals/contributing') diff --git a/docs/internals/contributing/writing-documentation.txt b/docs/internals/contributing/writing-documentation.txt index 469f8614b9..2944dea504 100644 --- a/docs/internals/contributing/writing-documentation.txt +++ b/docs/internals/contributing/writing-documentation.txt @@ -188,8 +188,8 @@ Our policy for new features is: release, not the development version. Our preferred way for marking new features is by prefacing the features' -documentation with: "``.. versionadded:: X.Y``", followed by an optional one -line comment and a mandatory blank line. +documentation with: "``.. versionadded:: X.Y``", followed by a a mandatory +blank line and an optional content (indented). General improvements, or other changes to the APIs that should be emphasized should use the "``.. versionchanged:: X.Y``" directive (with the same format -- cgit v1.3 From 8f7276b782e4e10f3e361f9d833f4e415e70bb28 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Thu, 25 Apr 2013 10:32:27 +0200 Subject: Updated Transifex links to the Django project Translations for the Django framework are now hosted on the django-core Transifex project, and the django project is only dedicated to a team-only hub project. --- .tx/config | 30 +++++++++++++++--------------- docs/internals/contributing/localizing.txt | 2 +- scripts/manage_translations.py | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) (limited to 'docs/internals/contributing') diff --git a/.tx/config b/.tx/config index cb617326b9..fdd7a576f7 100644 --- a/.tx/config +++ b/.tx/config @@ -2,77 +2,77 @@ host = https://www.transifex.com lang_map = sr@latin:sr_Latn -[django.core] +[django-core.core] file_filter = django/conf/locale//LC_MESSAGES/django.po source_file = django/conf/locale/en/LC_MESSAGES/django.po source_lang = en -[django.contrib-admin] +[django-core.contrib-admin] file_filter = django/contrib/admin/locale//LC_MESSAGES/django.po source_file = django/contrib/admin/locale/en/LC_MESSAGES/django.po source_lang = en -[django.contrib-admin-js] +[django-core.contrib-admin-js] file_filter = django/contrib/admin/locale//LC_MESSAGES/djangojs.po source_file = django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po source_lang = en -[django.contrib-admindocs] +[django-core.contrib-admindocs] file_filter = django/contrib/admindocs/locale//LC_MESSAGES/django.po source_file = django/contrib/admindocs/locale/en/LC_MESSAGES/django.po source_lang = en -[django.contrib-auth] +[django-core.contrib-auth] file_filter = django/contrib/auth/locale//LC_MESSAGES/django.po source_file = django/contrib/auth/locale/en/LC_MESSAGES/django.po source_lang = en -[django.contrib-comments] +[django-core.contrib-comments] file_filter = django/contrib/comments/locale//LC_MESSAGES/django.po source_file = django/contrib/comments/locale/en/LC_MESSAGES/django.po source_lang = en -[django.contrib-contenttypes] +[django-core.contrib-contenttypes] file_filter = django/contrib/contenttypes/locale//LC_MESSAGES/django.po source_file = django/contrib/contenttypes/locale/en/LC_MESSAGES/django.po source_lang = en -[django.contrib-flatpages] +[django-core.contrib-flatpages] file_filter = django/contrib/flatpages/locale//LC_MESSAGES/django.po source_file = django/contrib/flatpages/locale/en/LC_MESSAGES/django.po source_lang = en -[django.contrib-formtools] +[django-core.contrib-formtools] file_filter = django/contrib/formtools/locale//LC_MESSAGES/django.po source_file = django/contrib/formtools/locale/en/LC_MESSAGES/django.po source_lang = en -[django.contrib-gis] +[django-core.contrib-gis] file_filter = django/contrib/gis/locale//LC_MESSAGES/django.po source_file = django/contrib/gis/locale/en/LC_MESSAGES/django.po source_lang = en -[django.contrib-humanize] +[django-core.contrib-humanize] file_filter = django/contrib/humanize/locale//LC_MESSAGES/django.po source_file = django/contrib/humanize/locale/en/LC_MESSAGES/django.po source_lang = en -[django.contrib-messages] +[django-core.contrib-messages] file_filter = django/contrib/messages/locale//LC_MESSAGES/django.po source_file = django/contrib/messages/locale/en/LC_MESSAGES/django.po source_lang = en -[django.contrib-redirects] +[django-core.contrib-redirects] file_filter = django/contrib/redirects/locale//LC_MESSAGES/django.po source_file = django/contrib/redirects/locale/en/LC_MESSAGES/django.po source_lang = en -[django.contrib-sessions] +[django-core.contrib-sessions] file_filter = django/contrib/sessions/locale//LC_MESSAGES/django.po source_file = django/contrib/sessions/locale/en/LC_MESSAGES/django.po source_lang = en -[django.contrib-sites] +[django-core.contrib-sites] file_filter = django/contrib/sites/locale//LC_MESSAGES/django.po source_file = django/contrib/sites/locale/en/LC_MESSAGES/django.po source_lang = en diff --git a/docs/internals/contributing/localizing.txt b/docs/internals/contributing/localizing.txt index 0cde77882c..01b88d8d9a 100644 --- a/docs/internals/contributing/localizing.txt +++ b/docs/internals/contributing/localizing.txt @@ -62,5 +62,5 @@ Django source tree, as for any code change: .. _Transifex: https://www.transifex.com/ .. _Django i18n mailing list: http://groups.google.com/group/django-i18n/ -.. _Django project page: https://www.transifex.com/projects/p/django/ +.. _Django project page: https://www.transifex.com/projects/p/django-core/ .. _Transifex User Guide: http://help.transifex.com/ diff --git a/scripts/manage_translations.py b/scripts/manage_translations.py index b90b26e1f8..3e58040187 100644 --- a/scripts/manage_translations.py +++ b/scripts/manage_translations.py @@ -47,9 +47,9 @@ def _get_locale_dirs(include_core=True): def _tx_resource_for_name(name): """ Return the Transifex resource name """ if name == 'core': - return "django.core" + return "django-core.core" else: - return "django.contrib-%s" % name + return "django-core.contrib-%s" % name def _check_diff(cat_name, base_path): """ -- cgit v1.3