htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into editor-frontend-refactor

Browse Source 
Conflicts:
	app/assets/javascripts/editor.js.erb
---> kept refactored one
This commit is contained in:
Ralf Teusner
2016-09-09 14:17:42 +02:00
parent d2dab21292 8fe9303288
commit 0f76b1cb90
11 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/locales/en.yml
View File

@@ -252,7 +252,7 @@ en:
comment:
a_comment: comment
line: line
dialogtitle: Comment on this line!
dialogtitle: Comment on this line
others: Other comments on this line
addyours: Add your comment
addComment: Comment this
@@ -279,6 +279,7 @@ en:
external_users: External Users
submit:
failure: An error occured while transmitting your score. Please try again later.
full_score_redirect_to_rfc: Congratulations! You achieved and submitted the highest possible score for this exercise. Another participant has a question concerning the exercise you just solved. Your help and comments will be greatly appreciated!
external_users:
statistics:
no_data_available: No data available.