Merge branch 'master' of git://github.com/julienmalard/readthedocs.org into julienmalard-master

Author: ericholscher

readthedocs/projects/constants.py

@@ -114,7 +114,9 @@
 LANGUAGES = (
     ('aa', 'Afar'),
     ('ab', 'Abkhaz'),
+    ('acr', 'Achi'),
     ('af', 'Afrikaans'),
+    ('agu', 'Awakateko'),
     ('am', 'Amharic'),
     ('ar', 'Arabic'),
     ('as', 'Assamese'),
@@ -129,6 +131,10 @@
     ('bo', 'Tibetan'),
     ('br', 'Breton'),
     ('ca', 'Catalan'),
+    ('caa', 'Ch\'orti\''),
+    ('cac', 'Chuj'),
+    ('cab', 'Garífuna'),
+    ('cak', 'Kaqchikel'),
     ('co', 'Corsican'),
     ('cs', 'Czech'),
     ('cy', 'Welsh'),
@@ -164,14 +170,20 @@
     ('ik', 'Inupiaq'),
     ('is', 'Icelandic'),
     ('it', 'Italian'),
+    ('itz', 'Itza\''),
     ('iu', 'Inuktitut'),
+    ('ixl', 'Ixil'),
     ('ja', 'Japanese'),
+    ('jac', 'Popti\''),
     ('jv', 'Javanese'),
     ('ka', 'Georgian'),
+    ('kjb', 'Q\'anjob\'al'),
+    ('kek', 'Q\'eqchi\''),
     ('kk', 'Kazakh'),
     ('kl', 'Kalaallisut'),
     ('km', 'Khmer'),
     ('kn', 'Kannada'),
+    ('knj', 'Akateko'),
     ('ko', 'Korean'),
     ('ks', 'Kashmiri'),
     ('ku', 'Kurdish'),
@@ -181,11 +193,13 @@
     ('lo', 'Lao'),
     ('lt', 'Lithuanian'),
     ('lv', 'Latvian'),
+    ('mam', 'Mam'),
     ('mg', 'Malagasy'),
     ('mi', 'Maori'),
     ('mk', 'Macedonian'),
     ('ml', 'Malayalam'),
     ('mn', 'Mongolian'),
+    ('mop', 'Mopan'),
     ('mr', 'Marathi'),
     ('ms', 'Malay'),
     ('mt', 'Maltese'),
@@ -199,9 +213,15 @@
     ('or', 'Oriya'),
     ('pa', 'Panjabi'),
     ('pl', 'Polish'),
+    ('pnb', 'Western Punjabi'),
+    ('poc', 'Poqomam'),
+    ('poh', 'Poqomchi'),
     ('ps', 'Pashto'),
     ('pt', 'Portuguese'),
     ('qu', 'Quechua'),
+    ('quc', 'K\'iche\''),
+    ('qum', 'Sipakapense'),
+    ('quv', 'Sakapulteko'),
     ('rm', 'Romansh'),
     ('rn', 'Kirundi'),
     ('ro', 'Romanian'),
@@ -212,6 +232,7 @@
     ('sg', 'Sango'),
     ('si', 'Sinhala'),
     ('sk', 'Slovak'),
+    ('skr', 'Saraiki'),
     ('sl', 'Slovenian'),
     ('sm', 'Samoan'),
     ('sn', 'Shona'),
@@ -235,15 +256,19 @@
     ('tr', 'Turkish'),
     ('ts', 'Tsonga'),
     ('tt', 'Tatar'),
+    ('ttc', 'Tektiteko'),
+    ('tzj', 'Tz\'utujil'),
     ('tw', 'Twi'),
     ('ug', 'Uyghur'),
     ('uk', 'Ukrainian'),
     ('ur', 'Urdu'),
+    ('usp', 'Uspanteko'),
     ('uz', 'Uzbek'),
     ('vi', 'Vietnamese'),
     ('vo', 'Volapuk'),
     ('wo', 'Wolof'),
     ('xh', 'Xhosa'),
+    ('xin', 'Xinka'),
     ('yi', 'Yiddish'),
     ('yo', 'Yoruba'),
     ('za', 'Zhuang'),

readthedocs/projects/migrations/0024_auto_20180316_1023.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.12 on 2018-03-16 10:23
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('projects', '0023_migrate-alias-slug'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='project',
+            name='language',
+            field=models.CharField(choices=[('aa', 'Afar'), ('ab', 'Abkhaz'), ('acr', 'Achi'), ('af', 'Afrikaans'), ('agu', 'Awakateko'), ('am', 'Amharic'), ('ar', 'Arabic'), ('as', 'Assamese'), ('ay', 'Aymara'), ('az', 'Azerbaijani'), ('ba', 'Bashkir'), ('be', 'Belarusian'), ('bg', 'Bulgarian'), ('bh', 'Bihari'), ('bi', 'Bislama'), ('bn', 'Bengali'), ('bo', 'Tibetan'), ('br', 'Breton'), ('ca', 'Catalan'), ('caa', "Ch'orti'"), ('cac', 'Chuj'), ('cab', 'Garífuna'), ('cak', 'Kaqchikel'), ('co', 'Corsican'), ('cs', 'Czech'), ('cy', 'Welsh'), ('da', 'Danish'), ('de', 'German'), ('dz', 'Dzongkha'), ('el', 'Greek'), ('en', 'English'), ('eo', 'Esperanto'), ('es', 'Spanish'), ('et', 'Estonian'), ('eu', 'Basque'), ('fa', 'Iranian'), ('fi', 'Finnish'), ('fj', 'Fijian'), ('fo', 'Faroese'), ('fr', 'French'), ('fy', 'Western Frisian'), ('ga', 'Irish'), ('gd', 'Scottish Gaelic'), ('gl', 'Galician'), ('gn', 'Guarani'), ('gu', 'Gujarati'), ('ha', 'Hausa'), ('hi', 'Hindi'), ('he', 'Hebrew'), ('hr', 'Croatian'), ('hu', 'Hungarian'), ('hy', 'Armenian'), ('ia', 'Interlingua'), ('id', 'Indonesian'), ('ie', 'Interlingue'), ('ik', 'Inupiaq'), ('is', 'Icelandic'), ('it', 'Italian'), ('itz', "Itza'"), ('iu', 'Inuktitut'), ('ixl', 'Ixil'), ('ja', 'Japanese'), ('jac', "Popti'"), ('jv', 'Javanese'), ('ka', 'Georgian'), ('kjb', "Q'anjob'al"), ('kek', "Q'eqchi'"), ('kk', 'Kazakh'), ('kl', 'Kalaallisut'), ('km', 'Khmer'), ('kn', 'Kannada'), ('knj', 'Akateko'), ('ko', 'Korean'), ('ks', 'Kashmiri'), ('ku', 'Kurdish'), ('ky', 'Kyrgyz'), ('la', 'Latin'), ('ln', 'Lingala'), ('lo', 'Lao'), ('lt', 'Lithuanian'), ('lv', 'Latvian'), ('mam', 'Mam'), ('mg', 'Malagasy'), ('mi', 'Maori'), ('mk', 'Macedonian'), ('ml', 'Malayalam'), ('mn', 'Mongolian'), ('mop', 'Mopan'), ('mr', 'Marathi'), ('ms', 'Malay'), ('mt', 'Maltese'), ('my', 'Burmese'), ('na', 'Nauru'), ('ne', 'Nepali'), ('nl', 'Dutch'), ('no', 'Norwegian'), ('oc', 'Occitan'), ('om', 'Oromo'), ('or', 'Oriya'), ('pa', 'Panjabi'), ('pl', 'Polish'), ('pnb', 'Western Punjabi'), ('poc', 'Poqomam'), ('poh', 'Poqomchi'), ('ps', 'Pashto'), ('pt', 'Portuguese'), ('qu', 'Quechua'), ('quc', "K'iche'"), ('qum', 'Sipakapense'), ('quv', 'Sakapulteko'), ('rm', 'Romansh'), ('rn', 'Kirundi'), ('ro', 'Romanian'), ('ru', 'Russian'), ('rw', 'Kinyarwanda'), ('sa', 'Sanskrit'), ('sd', 'Sindhi'), ('sg', 'Sango'), ('si', 'Sinhala'), ('sk', 'Slovak'), ('skr', 'Saraiki'), ('sl', 'Slovenian'), ('sm', 'Samoan'), ('sn', 'Shona'), ('so', 'Somali'), ('sq', 'Albanian'), ('sr', 'Serbian'), ('ss', 'Swati'), ('st', 'Southern Sotho'), ('su', 'Sudanese'), ('sv', 'Swedish'), ('sw', 'Swahili'), ('ta', 'Tamil'), ('te', 'Telugu'), ('tg', 'Tajik'), ('th', 'Thai'), ('ti', 'Tigrinya'), ('tk', 'Turkmen'), ('tl', 'Tagalog'), ('tn', 'Tswana'), ('to', 'Tonga'), ('tr', 'Turkish'), ('ts', 'Tsonga'), ('tt', 'Tatar'), ('ttc', 'Tektiteko'), ('tzj', "Tz'utujil"), ('tw', 'Twi'), ('ug', 'Uyghur'), ('uk', 'Ukrainian'), ('ur', 'Urdu'), ('usp', 'Uspanteko'), ('uz', 'Uzbek'), ('vi', 'Vietnamese'), ('vo', 'Volapuk'), ('wo', 'Wolof'), ('xh', 'Xhosa'), ('xin', 'Xinka'), ('yi', 'Yiddish'), ('yo', 'Yoruba'), ('za', 'Zhuang'), ('zh', 'Chinese'), ('zu', 'Zulu'), ('nb_NO', 'Norwegian Bokmal'), ('pt_BR', 'Brazilian Portuguese'), ('uk_UA', 'Ukrainian'), ('zh_CN', 'Simplified Chinese'), ('zh_TW', 'Traditional Chinese')], default='en', help_text="The language the project documentation is rendered in. Note: this affects your project's URL.", max_length=20, verbose_name='Language'),
+        ),
+    ]