Rename French and Cypriot Greek languages

Author: Danielle

instruments/migrations/0038_rename_french_and_greek_instruments.py

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.11 on 2018-03-23 21:06
+from __future__ import unicode_literals
+
+from django.db import migrations
+from common.models import Source
+
+def rename_sources(apps, schema_editor):
+    Source = apps.get_model("common", "Source")
+    Source.objects.filter(instrument_language = 'French (France)').update(instrument_language = 'French (French)')
+    Source.objects.filter(instrument_language = 'French (Quebec)').update(instrument_language = 'French (Quebecois)')
+    Source.objects.filter(instrument_language = 'Cypriot Greek').update(instrument_language = 'Greek (Cypriot)')
+
+def undo_rename_sources(apps, schema_editor):
+    Source = apps.get_model("common", "Source")
+    Source.objects.filter(instrument_language = 'French (French)').update(instrument_language = 'French (France)')
+    Source.objects.filter(instrument_language = 'French (Quebecois)').update(instrument_language = 'French (Quebec)')
+    Source.objects.filter(instrument_language = 'Greek (Cypriot)').update(instrument_language = 'Cypriot Greek')
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('instruments', '0037_update_hebrew_ws'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='French_France_WG',
+            new_name='French_French_WG',
+        ),
+        migrations.RenameModel(
+            old_name='French_France_WS',
+            new_name='French_French_WS',
+        ),
+        migrations.RenameModel(
+            old_name='French_Quebec_WG',
+            new_name='French_Quebecois_WG',
+        ),
+        migrations.RenameModel(
+            old_name='French_Quebec_WS',
+            new_name='French_Quebecois_WS',
+        ),
+        migrations.RenameModel(
+            old_name='Cypriot_Greek_WS',
+            new_name='Greek_Cypriot_WS',
+        ),
+        migrations.RunPython(rename_sources, undo_rename_sources)
+    ]

instruments/models.py

@@ -6,8 +6,8 @@
 from schemas.Danish_WS import *
 from schemas.English_American_WG import *
 from schemas.English_American_WS import *
-from schemas.French_Quebec_WG import *
-from schemas.French_Quebec_WS import *
+from schemas.French_Quebecois_WG import *
+from schemas.French_Quebecois_WS import *
 from schemas.German_WS import *
 from schemas.Hebrew_WG import *
 from schemas.Hebrew_WS import *
@@ -34,7 +34,7 @@
 from schemas.American_Sign_Language_FormBOne import *
 from schemas.American_Sign_Language_FormBTwo import *
 from schemas.American_Sign_Language_FormC import *
-from schemas.Cypriot_Greek_WS import *
+from schemas.Greek_Cypriot_WS import *
 from schemas.Kigiriama_WG import *
 from schemas.Kigiriama_WS import *
 from schemas.Kiswahili_WG import *
@@ -46,8 +46,8 @@
 from schemas.Latvian_WS import *
 from schemas.Korean_WG import *
 from schemas.Korean_WS import *
-from schemas.French_France_WG import *
-from schemas.French_France_WS import *
+from schemas.French_French_WG import *
+from schemas.French_French_WS import *
 from schemas.Spanish_European_WG import *
 from schemas.Spanish_European_WS import *
 from schemas.Portuguese_European_WG import *

instruments/schemas/French_France_WG.py instruments/schemas/French_French_WG.py

@@ -2,7 +2,7 @@
 from instruments.base import BaseTable
 
 
-class French_France_WG(BaseTable):
+class French_French_WG(BaseTable):
     item_1_choices = [(u'no', u'no'), (u'yes', u'yes')]
     item_1 = models.CharField(max_length=3, choices=item_1_choices, null=True)
     item_2_choices = [(u'no', u'no'), (u'yes', u'yes')]

instruments/schemas/French_France_WS.py instruments/schemas/French_French_WS.py

@@ -2,7 +2,7 @@
 from instruments.base import BaseTable
 
 
-class French_France_WS(BaseTable):
+class French_French_WS(BaseTable):
     item_1_choices = [(u'produces', u'produces')]
     item_1 = models.CharField(max_length=8, choices=item_1_choices, null=True)
     item_2_choices = [(u'produces', u'produces')]

instruments/schemas/French_Quebec_WG.py instruments/schemas/French_Quebecois_WG.py

@@ -2,7 +2,7 @@
 from instruments.base import BaseTable
 
 
-class French_Quebec_WG(BaseTable):
+class French_Quebecois_WG(BaseTable):
     item_1_choices = [(u'understands', u'understands'), (u'produces', u'produces')]
     item_1 = models.CharField(max_length=11, choices=item_1_choices, null=True)
     item_2_choices = [(u'understands', u'understands'), (u'produces', u'produces')]

instruments/schemas/French_Quebec_WS.py instruments/schemas/French_Quebecois_WS.py

@@ -2,7 +2,7 @@
 from instruments.base import BaseTable
 
 
-class French_Quebec_WS(BaseTable):
+class French_Quebecois_WS(BaseTable):
     item_1_choices = [(u'produces', u'produces')]
     item_1 = models.CharField(max_length=8, choices=item_1_choices, null=True)
     item_2_choices = [(u'produces', u'produces')]

instruments/schemas/Cypriot_Greek_WS.py instruments/schemas/Greek_Cypriot_WS.py

@@ -2,7 +2,7 @@
 from instruments.base import BaseTable
 
 
-class Cypriot_Greek_WS(BaseTable):
+class Greek_Cypriot_WS(BaseTable):
     item_1_choices = [(u'produces', u'produces')]
     item_1 = models.CharField(max_length=8, choices=item_1_choices, null=True)
     item_2_choices = [(u'produces', u'produces')]

raw_data/French_France_WG/FrenchFranceWG_Bergmann_data.csv raw_data/French_French_WG/FrenchFrenchWG_Bergmann_data.csv

@@ -518,9 +518,9 @@
     {
         "name": "CLEX",
         "dataset": "",
-        "instrument_language": "French (Quebec)",
+        "instrument_language": "French (Quebecois)",
         "instrument_form": "WG",
-        "file": "raw_data/French_Quebec_WG/FrenchQuebecWG_CLEX.csv",
+        "file": "raw_data/French_Quebecois_WG/FrenchQuebecoisWG_CLEX.csv",
         "splitcol": false,
         "norming": true,
         "longitudinal": false,
@@ -557,9 +557,9 @@
     {
         "name": "Trudeau",
         "dataset": "",
-        "instrument_language": "French (Quebec)",
+        "instrument_language": "French (Quebecois)",
         "instrument_form": "WS",
-        "file": "raw_data/French_Quebec_WS/FrenchQuebecWS.csv",
+        "file": "raw_data/French_Quebecois_WS/FrenchQuebecoisWS.csv",
         "splitcol": false,
         "norming": false,
         "longitudinal": false,
@@ -652,9 +652,9 @@
     {
         "name": "Grohmann",
         "dataset": "",
-        "instrument_language": "Cypriot Greek",
+        "instrument_language": "Greek (Cypriot)",
         "instrument_form": "WS",
-        "file": "raw_data/Greek_WS/GreekWS_Grohmann.csv",
+        "file": "raw_data/Greek_Cypriot_WS/GreekCypriotWS_Grohmann.csv",
         "splitcol": false,
         "norming": false,
         "longitudinal": false,
@@ -924,9 +924,9 @@
     {
         "name": "Bergmann",
         "dataset": "",
-        "instrument_language": "French (France)",
+        "instrument_language": "French (French)",
         "instrument_form": "WG",
-        "file": "raw_data/French_France_WG/FrenchFranceWG_Bergmann.csv",
+        "file": "raw_data/French_French_WG/FrenchFrenchWG_Bergmann.csv",
         "splitcol": false,
         "norming": false,
         "longitudinal": false,
@@ -938,9 +938,9 @@
     {
         "name": "VonHolzen",
         "dataset": "",
-        "instrument_language": "French (France)",
+        "instrument_language": "French (French)",
         "instrument_form": "WG",
-        "file": "raw_data/French_France_WG/FrenchFranceWG_VonHolzen.csv",
+        "file": "raw_data/French_French_WG/FrenchFrenchWG_VonHolzen.csv",
         "splitcol": false,
         "norming": false,
         "longitudinal": true,
@@ -952,9 +952,9 @@
     {
         "name": "VonHolzen",
         "dataset": "",
-        "instrument_language": "French (France)",
+        "instrument_language": "French (French)",
         "instrument_form": "WS",
-        "file": "raw_data/French_France_WS/FrenchFranceWS_VonHolzen.csv",
+        "file": "raw_data/French_French_WS/FrenchFrenchWS_VonHolzen.csv",
         "splitcol": false,
         "norming": false,
         "longitudinal": true,

raw_data/French_France_WG/FrenchFranceWG_Bergmann_fields.csv raw_data/French_French_WG/FrenchFrenchWG_Bergmann_fields.csv

@@ -64,17 +64,17 @@
         "has_grammar": true
     },
     {
-        "language": "French (Quebec)",
+        "language": "French (Quebecois)",
         "form": "WG",
-        "file": "raw_data/French_Quebec_WG/[French_Quebec_WG].csv",
+        "file": "raw_data/French_Quebecois_WG/[French_Quebecois_WG].csv",
         "age_min": 8,
         "age_max": 16,
         "has_grammar": false
     },
     {
-        "language": "French (Quebec)",
+        "language": "French (Quebecois)",
         "form": "WS",
-        "file": "raw_data/French_Quebec_WS/[French_Quebec_WS].csv",
+        "file": "raw_data/French_Quebecois_WS/[French_Quebecois_WS].csv",
         "age_min": 16,
         "age_max": 30,
         "has_grammar": true
@@ -288,9 +288,9 @@
         "has_grammar": false
     },
     {
-        "language": "Cypriot Greek",
+        "language": "Greek (Cypriot)",
         "form": "WS",
-        "file": "raw_data/Greek_WS/[Greek_WS].csv",
+        "file": "raw_data/Greek_Cypriot_WS/[Greek_Cypriot_WS].csv",
         "age_min": 18,
         "age_max": 30,
         "has_grammar": false
@@ -384,17 +384,17 @@
         "has_grammar": true
     },
     {
-        "language": "French (France)",
+        "language": "French (French)",
         "form": "WG",
-        "file": "raw_data/French_France_WG/[French_France_WG].csv",
+        "file": "raw_data/French_French_WG/[French_French_WG].csv",
         "age_min": 8,
         "age_max": 16,
         "has_grammar": false
     },
     {
-        "language": "French (France)",
+        "language": "French (French)",
         "form": "WS",
-        "file": "raw_data/French_France_WS/[French_France_WS].csv",
+        "file": "raw_data/French_French_WS/[French_French_WS].csv",
         "age_min": 16,
         "age_max": 30,
         "has_grammar": true