Skip to content

Commit

Permalink
Merge pull request #111 from nephila/feature/lang_doc
Browse files Browse the repository at this point in the history
Clarify supported languages.
  • Loading branch information
yakky committed May 20, 2014
2 parents 4709629 + 943d262 commit e10d575
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
3 changes: 2 additions & 1 deletion djangocms_installer/config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ def parse(args):
choices=('yes', 'no'),
default='yes', help='Activate CMS permission management')
parser.add_argument('--languages', '-l', dest='languages', action='append',
help='Languages to enable. Option can be provided multiple times, or as a comma separated list')
help='Languages to enable. Option can be provided multiple times, or as a comma separated list. '
'Only language codes supported by Django can be used here')
parser.add_argument('--django-version', dest='django_version', action='store',
choices=('1.4', '1.5', '1.6', 'stable'),
default='stable', help='Django version')
Expand Down
5 changes: 4 additions & 1 deletion docs/reference.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ The following arguments can be overridden in :ref:`wizard_mode`
* ``--timezone``, ``-t``: Optional default time zone, default: ``America/Chicago``
* ``--reversion``, ``-e``: Install and configure reversion support, choices: ``yes|no``, default: ``yes``
* ``--permissions``: Activate CMS permission management; choices: ``yes|no``, default: ``yes``
* ``--languages``, ``-l``: Languages to enable. Option can be provided multiple times, or as a comma separated list
* ``--languages``, ``-l``: Languages available for the project. Option can be provided multiple times, or as a
comma separated list.
Only language codes supported by Django can be used here. Refer to `django source`_ for a list of supported codes.
* ``--django-version``: Django version; choices: ``1.4|1.5|1.6|stable``, default: ``stable``
* ``--cms-version``, ``-v``: django CMS version, choices: ``2.4|3.0|stable|develop``. default: ``stable``
* ``--bootstrap``: Use Twitter Bootstrap as theme, choices: ``yes|no``, default: ``no``
Expand Down Expand Up @@ -62,3 +64,4 @@ advanced usage:


.. _dj-database-url: https://github.com/kennethreitz/dj-database-url
.. _django source: https://github.com/django/django/blob/master/django/conf/global_settings.py#L50

0 comments on commit e10d575

Please sign in to comment.