Merge pull request #3499 from davidfischer/prog-language-in-readthedo…

…csdata Add programming language to API/READTHEDOCS_DATA
readthedocs · Jan 10, 2018 · d63caef · d63caef
2 parents c411ca3 + 9289d54
commit d63caef
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/readthedocs/doc_builder/backends/mkdocs.py b/readthedocs/doc_builder/backends/mkdocs.py
@@ -123,6 +123,7 @@ def generate_rtd_data(self, docs_dir):
             'project': self.version.project.slug,
             'version': self.version.slug,
             'language': self.version.project.language,
+            'programming_language': self.version.project.programming_language,
             'page': None,
             'theme': "readthedocs",
             'builder': "mkdocs",

diff --git a/readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl b/readthedocs/doc_builder/templates/doc_builder/conf.py.tmpl
@@ -93,6 +93,7 @@ context = {
     'slug': '{{ project.slug }}',
     'name': u'{{ project.name }}',
     'rtd_language': u'{{ project.language }}',
+    'programming_language': u'{{ project.programming_language }}',
     'canonical_url': '{{ project.get_canonical_url }}',
     'analytics_code': '{{ project.analytics_code }}',
     'single_version': {{ project.single_version }},

diff --git a/readthedocs/restapi/serializers.py b/readthedocs/restapi/serializers.py
@@ -18,7 +18,7 @@ class Meta(object):
         fields = (
             'id',
             'name', 'slug', 'description', 'language',
-            'repo', 'repo_type',
+            'programming_language', 'repo', 'repo_type',
             'default_version', 'default_branch',
             'documentation_type',
             'users',

diff --git a/readthedocs/rtd_tests/tests/test_api.py b/readthedocs/rtd_tests/tests/test_api.py
@@ -560,6 +560,7 @@ def test_get_version_by_id(self):
                 'install_project': False,
                 'language': 'en',
                 'name': 'Pip',
+                'programming_language': 'words',
                 'python_interpreter': 'python',
                 'repo': 'https://github.com/pypa/pip',
                 'repo_type': 'git',