Use general i18n

codecombat · Dec 16, 2016 · 3a0c2e7 · 3a0c2e7
1 parent 3fd7eaf
commit 3a0c2e7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/app/locale/en.coffee b/app/locale/en.coffee
@@ -1593,9 +1593,7 @@
     student_details: "Student Details"
     student_name: "Student Name"
     no_name: "No name provided."
-    student_username: "Username"
     no_username: "No username provided."
-    student_email: "Email" #{change}
     no_email: "Student has no email address set."
     student_profile: "Student Profile"
     playtime_detail: "Playtime Detail"

diff --git a/app/templates/teachers/edit-student-modal.jade b/app/templates/teachers/edit-student-modal.jade
@@ -20,14 +20,14 @@ block modal-body-content
         else 
           i(data-i18n="teacher.no_name")
       .small-details 
-        span(data-i18n="teacher.student_username")
+        span(data-i18n="general.username")
         span.spr :
         if (view.user.get('name'))
           span= view.user.get('name')
         else 
           i(data-i18n="teacher.no_username")
       .small-details  
-        span(data-i18n="teacher.student_email")
+        span(data-i18n="general.email")
         span.spr :
         if (view.user.get('email'))
           a(href= "mailto:"+view.user.get('email'))

diff --git a/app/templates/teachers/teacher-student-view.jade b/app/templates/teachers/teacher-student-view.jade
@@ -98,14 +98,14 @@ block content
               else 
                 i(data-i18n="teacher.no_name")
             .small-details 
-              span(data-i18n="teacher.student_username")
+              span(data-i18n="general.username")
               span.spr :
               if (view.user.get('name'))
                 span= view.user.get('name')
               else 
                 i(data-i18n="teacher.no_username")
             .small-details  
-              span(data-i18n="teacher.student_email")
+              span(data-i18n="general.email")
               span.spr :
               if (view.user.get('email'))
                 a(href= "mailto:"+view.user.get('email'))