Permalink
Browse files

Merge branch 'develop' into new_i18n

Conflicts:
	cms/locale/ar/LC_MESSAGES/django.po
	cms/locale/bg/LC_MESSAGES/django.po
	cms/locale/bn/LC_MESSAGES/django.po
	cms/locale/ca/LC_MESSAGES/django.po
	cms/locale/cs/LC_MESSAGES/django.po
	cms/locale/cy/LC_MESSAGES/django.po
	cms/locale/da/LC_MESSAGES/django.po
	cms/locale/de/LC_MESSAGES/django.mo
	cms/locale/de/LC_MESSAGES/django.po
	cms/locale/el/LC_MESSAGES/django.po
	cms/locale/en/LC_MESSAGES/django.po
	cms/locale/es/LC_MESSAGES/django.po
	cms/locale/es_AR/LC_MESSAGES/django.po
	cms/locale/es_BO/LC_MESSAGES/django.po
	cms/locale/et/LC_MESSAGES/django.po
	cms/locale/eu/LC_MESSAGES/django.po
	cms/locale/fa/LC_MESSAGES/django.po
	cms/locale/fi/LC_MESSAGES/django.po
	cms/locale/fr/LC_MESSAGES/django.po
	cms/locale/gu/LC_MESSAGES/django.po
	cms/locale/he/LC_MESSAGES/django.po
	cms/locale/hi/LC_MESSAGES/django.po
	cms/locale/hr/LC_MESSAGES/django.po
	cms/locale/hu/LC_MESSAGES/django.po
	cms/locale/it/LC_MESSAGES/django.po
	cms/locale/ja/LC_MESSAGES/django.po
	cms/locale/ka/LC_MESSAGES/django.po
	cms/locale/km/LC_MESSAGES/django.po
	cms/locale/ku_IQ/LC_MESSAGES/django.po
	cms/locale/nl/LC_MESSAGES/django.po
	cms/locale/no/LC_MESSAGES/django.po
	cms/locale/pl/LC_MESSAGES/django.po
	cms/locale/pt/LC_MESSAGES/django.po
	cms/locale/pt_BR/LC_MESSAGES/django.po
	cms/locale/ro/LC_MESSAGES/django.po
	cms/locale/ru/LC_MESSAGES/django.po
	cms/locale/sk/LC_MESSAGES/django.po
	cms/locale/sl_SI/LC_MESSAGES/django.po
	cms/locale/sr@latin/LC_MESSAGES/django.po
	cms/locale/sv/LC_MESSAGES/django.po
	cms/locale/tr/LC_MESSAGES/django.po
	cms/locale/uk/LC_MESSAGES/django.po
	cms/locale/zh_CN/LC_MESSAGES/django.po
	cms/locale/zh_TW/LC_MESSAGES/django.po
	cms/utils/page_resolver.py
	test_requirements/requirements_base.txt
  • Loading branch information...
2 parents 838db9a + dc7937c commit 569cffc9ba876ecd0acd494a46d063c5f7109f09 @digi604 digi604 committed Sep 20, 2012
Showing with 3,367 additions and 5,312 deletions.
  1. +1 −1 .tx/config
  2. +1 −1 CHANGELOG.txt
  3. +199 −0 CONTRIBUTING.rst
  4. +1 −1 cms/__init__.py
  5. BIN cms/locale/ar/LC_MESSAGES/django.mo
  6. +73 −149 cms/locale/ar/LC_MESSAGES/django.po
  7. BIN cms/locale/bg/LC_MESSAGES/django.mo
  8. +60 −119 cms/locale/bg/LC_MESSAGES/django.po
  9. BIN cms/locale/bn/LC_MESSAGES/django.mo
  10. +32 −41 cms/locale/bn/LC_MESSAGES/django.po
  11. BIN cms/locale/ca/LC_MESSAGES/django.mo
  12. +62 −125 cms/locale/ca/LC_MESSAGES/django.po
  13. BIN cms/locale/cs/LC_MESSAGES/django.mo
  14. +68 −131 cms/locale/cs/LC_MESSAGES/django.po
  15. BIN cms/locale/cy/LC_MESSAGES/django.mo
  16. +32 −42 cms/locale/cy/LC_MESSAGES/django.po
  17. BIN cms/locale/da/LC_MESSAGES/django.mo
  18. +61 −119 cms/locale/da/LC_MESSAGES/django.po
  19. BIN cms/locale/de/LC_MESSAGES/django.mo
  20. +84 −150 cms/locale/de/LC_MESSAGES/django.po
  21. BIN cms/locale/el/LC_MESSAGES/django.mo
  22. +61 −87 cms/locale/el/LC_MESSAGES/django.po
  23. BIN cms/locale/en/LC_MESSAGES/django.mo
  24. +18 −26 cms/locale/en/LC_MESSAGES/django.po
  25. BIN cms/locale/es/LC_MESSAGES/django.mo
  26. +68 −139 cms/locale/es/LC_MESSAGES/django.po
  27. BIN cms/locale/es_AR/LC_MESSAGES/django.mo
  28. +50 −76 cms/locale/es_AR/LC_MESSAGES/django.po
  29. BIN cms/locale/es_BO/LC_MESSAGES/django.mo
  30. +70 −142 cms/locale/es_BO/LC_MESSAGES/django.po
  31. BIN cms/locale/et/LC_MESSAGES/django.mo
  32. +45 −54 cms/locale/et/LC_MESSAGES/django.po
  33. BIN cms/locale/eu/LC_MESSAGES/django.mo
  34. +328 −336 cms/locale/eu/LC_MESSAGES/django.po
  35. BIN cms/locale/fa/LC_MESSAGES/django.mo
  36. +100 −184 cms/locale/fa/LC_MESSAGES/django.po
  37. BIN cms/locale/fi/LC_MESSAGES/django.mo
  38. +89 −180 cms/locale/fi/LC_MESSAGES/django.po
  39. BIN cms/locale/fr/LC_MESSAGES/django.mo
  40. +65 −131 cms/locale/fr/LC_MESSAGES/django.po
  41. +12 −13 cms/locale/fr/LC_MESSAGES/djangojs.po
  42. BIN cms/locale/gu/LC_MESSAGES/django.mo
  43. +42 −40 cms/locale/gu/LC_MESSAGES/django.po
  44. BIN cms/locale/he/LC_MESSAGES/django.mo
  45. +32 −41 cms/locale/he/LC_MESSAGES/django.po
  46. BIN cms/locale/hi/LC_MESSAGES/django.mo
  47. +73 −148 cms/locale/hi/LC_MESSAGES/django.po
  48. BIN cms/locale/hr/LC_MESSAGES/django.mo
  49. +58 −115 cms/locale/hr/LC_MESSAGES/django.po
  50. BIN cms/locale/hu/LC_MESSAGES/django.mo
  51. +32 −41 cms/locale/hu/LC_MESSAGES/django.po
  52. BIN cms/locale/it/LC_MESSAGES/django.mo
  53. +108 −218 cms/locale/it/LC_MESSAGES/django.po
  54. BIN cms/locale/ja/LC_MESSAGES/django.mo
  55. +43 −62 cms/locale/ja/LC_MESSAGES/django.po
  56. BIN cms/locale/ka/LC_MESSAGES/django.mo
  57. +32 −41 cms/locale/ka/LC_MESSAGES/django.po
  58. BIN cms/locale/km/LC_MESSAGES/django.mo
  59. +62 −110 cms/locale/km/LC_MESSAGES/django.po
  60. BIN cms/locale/ku_IQ/LC_MESSAGES/django.mo
  61. +61 −123 cms/locale/ku_IQ/LC_MESSAGES/django.po
  62. BIN cms/locale/nl/LC_MESSAGES/django.mo
  63. +69 −146 cms/locale/nl/LC_MESSAGES/django.po
  64. BIN cms/locale/no/LC_MESSAGES/django.mo
  65. +60 −115 cms/locale/no/LC_MESSAGES/django.po
  66. BIN cms/locale/pl/LC_MESSAGES/django.mo
  67. +62 −129 cms/locale/pl/LC_MESSAGES/django.po
  68. BIN cms/locale/pt/LC_MESSAGES/django.mo
  69. +158 −223 cms/locale/pt/LC_MESSAGES/django.po
  70. +12 −13 cms/locale/pt/LC_MESSAGES/djangojs.po
  71. BIN cms/locale/pt_BR/LC_MESSAGES/django.mo
  72. +66 −134 cms/locale/pt_BR/LC_MESSAGES/django.po
  73. BIN cms/locale/ro/LC_MESSAGES/django.mo
  74. +122 −151 cms/locale/ro/LC_MESSAGES/django.po
  75. BIN cms/locale/ru/LC_MESSAGES/django.mo
  76. +98 −188 cms/locale/ru/LC_MESSAGES/django.po
  77. BIN cms/locale/sk/LC_MESSAGES/django.mo
  78. +78 −169 cms/locale/sk/LC_MESSAGES/django.po
  79. BIN cms/locale/sl_SI/LC_MESSAGES/django.mo
  80. +57 −112 cms/locale/sl_SI/LC_MESSAGES/django.po
  81. BIN cms/locale/sr@latin/LC_MESSAGES/django.mo
  82. +57 −109 cms/locale/sr@latin/LC_MESSAGES/django.po
  83. BIN cms/locale/sv/LC_MESSAGES/django.mo
  84. +55 −105 cms/locale/sv/LC_MESSAGES/django.po
  85. BIN cms/locale/tr/LC_MESSAGES/django.mo
  86. +49 −80 cms/locale/tr/LC_MESSAGES/django.po
  87. BIN cms/locale/uk/LC_MESSAGES/django.mo
  88. +49 −46 cms/locale/uk/LC_MESSAGES/django.po
  89. BIN cms/locale/zh_CN/LC_MESSAGES/django.mo
  90. +43 −72 cms/locale/zh_CN/LC_MESSAGES/django.po
  91. BIN cms/locale/zh_TW/LC_MESSAGES/django.mo
  92. +66 −126 cms/locale/zh_TW/LC_MESSAGES/django.po
  93. +62 −0 cms/plugins/googlemap/migrations/0011_remove_zoom_null_values.py
  94. +1 −2 ...t__chg_field.py → 0012_auto__add_field_googlemap_width__add_field_googlemap_height__chg_field.py}
  95. +12 −0 cms/tests/page.py
  96. +16 −8 cms/utils/page_resolver.py
  97. +1 −190 docs/contribution.rst
  98. +22 −7 docs/getting_started/plugin_reference.rst
  99. +19 −0 docs/upgrade/2.3.2.rst
  100. +8 −0 docs/upgrade/index.rst
  101. +2 −1 test_requirements/requirements_base.txt
View
@@ -4,7 +4,7 @@ source_file = cms/locale/en/LC_MESSAGES/djangojs.po
source_lang = en
[main]
-host = http://www.transifex.net
+host = https://www.transifex.com
[django-cms.core]
file_filter = cms/locale/<lang>/LC_MESSAGES/django.po
View
@@ -95,7 +95,7 @@
- Fixed wrong language prefix handling for form actions and admin preview
- Admin icons in django 1.4 fixed
- Added requirements.txt for pip and testing in test_requirements
-- Google map plugin with height and width properties
+- Google map plugin with height and width properties. Migrations will set default values on not-null fields.
- Docs fixes
- Code cleanup
- Switched html5lib to HTML serializer
View
@@ -0,0 +1,199 @@
+##########################
+Contributing to django CMS
+##########################
+
+Like every open-source project, django CMS is always looking for motivated
+individuals to contribute to its source code.
+However, to ensure the highest code quality and keep the repository nice and
+tidy, everybody has to follow a few rules (nothing major, I promise :) )
+
+
+*********
+Community
+*********
+
+People interested in developing for the django CMS should join the
+`django-cms-developers`_ mailing list as well as heading over to #django-cms on
+the `freenode`_ IRC network for help and to discuss the development.
+
+You may also be interested in following `@djangocmsstatus`_ on twitter to get the
+GitHub commits as well as the hudson build reports. There is also a `@djangocms`_
+account for less technical announcements.
+
+
+*************
+In a nutshell
+*************
+
+Here's what the contribution process looks like, in a bullet-points fashion, and
+only for the stuff we host on GitHub:
+
+#. django CMS is hosted on `GitHub`_, at https://github.com/divio/django-cms
+#. The best method to contribute back is to create an account there, then fork
+ the project. You can use this fork as if it was your own project, and should
+ push your changes to it.
+#. When you feel your code is good enough for inclusion, "send us a `pull
+ request`_", by using the nice GitHub web interface.
+
+
+
+*****************
+Contributing Code
+*****************
+
+
+Getting the source code
+=======================
+
+If you're interested in developing a new feature for the CMS, it is recommended
+that you first discuss it on the `django-cms-developers`_ mailing list so as
+not to do any work that will not get merged in anyway.
+
+- Code will be reviewed and tested by at least one core developer, preferably
+ by several. Other community members are welcome to give feedback.
+- Code *must* be tested. Your pull request should include unit-tests (that cover
+ the piece of code you're submitting, obviously)
+- Documentation should reflect your changes if relevant. There is nothing worse
+ than invalid documentation.
+- Usually, if unit tests are written, pass, and your change is relevant, then
+ it'll be merged.
+
+Since we're hosted on GitHub, django CMS uses `git`_ as a version control system.
+
+The `GitHub help`_ is very well written and will get you started on using git
+and GitHub in a jiffy. It is an invaluable resource for newbies and old timers
+alike.
+
+
+Syntax and conventions
+======================
+
+We try to conform to `PEP8`_ as much as possible. A few highlights:
+
+- Indentation should be exactly 4 spaces. Not 2, not 6, not 8. **4**. Also, tabs
+ are evil.
+- We try (loosely) to keep the line length at 79 characters. Generally the rule
+ is "it should look good in a terminal-base editor" (eg vim), but we try not be
+ [Godwin's law] about it.
+
+
+Process
+=======
+
+This is how you fix a bug or add a feature:
+
+#. `fork`_ us on GitHub.
+#. Checkout your fork.
+#. Hack hack hack, test test test, commit commit commit, test again.
+#. Push to your fork.
+#. Open a pull request.
+
+
+Tests
+=====
+
+Having a wide and comprehensive library of unit-tests and integration tests is
+of exceeding importance. Contributing tests is widely regarded as a very
+prestigious contribution (you're making everybody's future work much easier by
+doing so). Good karma for you. Cookie points. Maybe even a beer if we meet in
+person :)
+
+Generally tests should be:
+
+- Unitary (as much as possible). I.E. should test as much as possible only one
+ function/method/class. That's the
+ very definition of unit tests. Integration tests are interesting too
+ obviously, but require more time to maintain since they have a higher
+ probability of breaking.
+- Short running. No hard numbers here, but if your one test doubles the time it
+ takes for everybody to run them, it's probably an indication that you're doing
+ it wrong.
+
+In a similar way to code, pull requests will be reviewed before pulling
+(obviously), and we encourage discussion via code review (everybody learns
+something this way) or IRC discussions.
+
+Running the tests
+-----------------
+
+To run the tests simply execute ``python setup.py test`` from your shell.
+
+
+**************************
+Contributing Documentation
+**************************
+
+Perhaps considered "boring" by hard-core coders, documentation is sometimes even
+more important than code! This is what brings fresh blood to a project, and
+serves as a reference for old timers. On top of this, documentation is the one
+area where less technical people can help most - you just need to write
+semi-decent English. People need to understand you. We don't care about style or
+correctness.
+
+Documentation should be:
+
+- We use `Sphinx`_/`restructuredText`_. So obviously this is the format you should
+ use :) File extensions should be .rst.
+- Written in English. We could discuss how it would bring more people to the
+ project by having a Klingon or some other translation, but that's a problem we
+ will confront once we already have good documentation in English.
+- Accessible. You should assume the reader to be moderately familiar with
+ Python and Django, but not anything else. Link to documentation of libraries
+ you use, for example, even if they are "obvious" to you (South is the first
+ example that comes to mind - it's obvious to any Django programmer, but not to
+ any newbie at all).
+ A brief description of what it does is also welcome.
+
+Pulling of documentation is pretty fast and painless. Usually somebody goes over
+your text and merges it, since there are no "breaks" and that GitHub parses rst
+files automagically it's really convenient to work with.
+
+Also, contributing to the documentation will earn you great respect from the
+core developers. You get good karma just like a test contributor, but you get
+double cookie points. Seriously. You rock.
+
+Section style
+=============
+
+We use Python documentation conventions for section marking:
+
+* ``#`` with overline, for parts
+* ``*`` with overline, for chapters
+* ``=``, for sections
+* ``-``, for subsections
+* ``^``, for subsubsections
+* ``"``, for paragraphs
+
+
+************
+Translations
+************
+
+
+For translators we have a `Transifex account
+<https://www.transifex.com/projects/p/django-cms/>`_ where you can translate
+the .po files and don't need to install git or mercurial to be able to
+contribute. All changes there will be automatically sent to the project.
+
+
+ .. raw:: html
+
+ Top translations django-cms core:<br/>
+
+ <img border="0" src="https://www.transifex.com/projects/p/django-cms/resource/core/chart/image_png"/>
+
+
+
+.. _fork: http://github.com/divio/django-cms
+.. _Sphinx: http://sphinx.pocoo.org/
+.. _PEP8: http://www.python.org/dev/peps/pep-0008/
+.. _django-cms-developers: http://groups.google.com/group/django-cms-developers
+.. _GitHub : http://www.github.com
+.. _GitHub help : http://help.github.com
+.. _freenode : http://freenode.net/
+.. _@djangocmsstatus : https://twitter.com/djangocmsstatus
+.. _@djangocms : https://twitter.com/djangocms
+.. _pull request : http://help.github.com/send-pull-requests/
+.. _git : http://git-scm.com/
+.. _restructuredText: http://docutils.sourceforge.net/docs/ref/rst/introduction.html
+
View
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-__version__ = '2.3.2.post0'
+__version__ = '2.4.0.pre'
# patch settings
try:
Binary file not shown.
Oops, something went wrong. Retry.

0 comments on commit 569cffc

Please sign in to comment.