From 4c7567926a3254019e208fdd2bd9d8fc97c01db2 Mon Sep 17 00:00:00 2001 From: minwook shin Date: Thu, 14 Jan 2016 11:09:43 +0900 Subject: [PATCH 01/11] my first ko translation I'll translate other things . --- app/locale/ko.coffee | 66 ++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/app/locale/ko.coffee b/app/locale/ko.coffee index 02136fc32..156648f29 100644 --- a/app/locale/ko.coffee +++ b/app/locale/ko.coffee @@ -142,7 +142,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t save: "저장" publish: "내보내기" create: "생성" - fork: "Fork" + fork: "포크" play: "시작" # When used as an action verb, like "Play next level" retry: "재시도" actions: "행동" @@ -164,8 +164,8 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t accepted: "적용됨" rejected: "거부됨" withdrawn: "취소됨" -# accept: "Accept" -# reject: "Reject" + accept: "승인" + reject: "보류" # withdraw: "Withdraw" submitter: "제출자" submitted: "제출됨" @@ -224,9 +224,9 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t # completed_level: "Completed Level:" # course: "Course:" done: "완료" -# next_level: "Next Level:" -# next_game: "Next game" -# show_menu: "Show game menu" + next_level: "다음 레벨:" + next_game: "다음 게임" + show_menu: "게임 매뉴 보이기" home: "홈" # Not used any more, will be removed soon. level: "레벨" # Like "Level: Dungeons of Kithgard" skip: "넘어가기" @@ -265,8 +265,8 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t # victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks." victory_become_a_viking: "바이킹이 되세요" guide_title: "가이드" -# tome_cast_button_run: "Run" -# tome_cast_button_running: "Running" + tome_cast_button_run: "실행" + tome_cast_button_running: "실행중" # tome_cast_button_ran: "Ran" # tome_submit_button: "Submit" # tome_reload_method: "Reload original code for this method" # Title text for individual method reload button. @@ -274,13 +274,13 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t # tome_see_all_methods: "See all methods you can edit" # Title text for method list selector (shown when there are multiple programmable methods). tome_select_a_thang: "누군가를 선택하세요. " tome_available_spells: "사용 가능한 마법" -# tome_your_skills: "Your Skills" + tome_your_skills: "당신의 스킬" # tome_current_method: "Current Method" -# code_saved: "Code Saved" + code_saved: "코드가 저장됨" skip_tutorial: "넘기기 (esc)" keyboard_shortcuts: "단축키" loading_ready: "준비!" -# loading_start: "Start Level" + loading_start: "레벨 시작" problem_alert_title: "코드를 수정하세요" time_current: "현재:" time_total: "최대:" @@ -368,11 +368,11 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t day: "오늘" week: "이번 주" # all: "All-Time" -# time: "Time" + time: "시간" # damage_taken: "Damage Taken" # damage_dealt: "Damage Dealt" -# difficulty: "Difficulty" -# gold_collected: "Gold Collected" + difficulty: "난이도" + gold_collected: "수집된 골드" inventory: equipped_item: "장착됨" @@ -408,16 +408,16 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t # feature5: "Video tutorials" # feature6: "Premium email support" # feature7: "Private Clans" -# free: "Free" -# month: "month" + free: "프리" + month: "달" # must_be_logged: "You must be logged in first. Please create an account or log in from the menu above." -# subscribe_title: "Subscribe" -# unsubscribe: "Unsubscribe" -# confirm_unsubscribe: "Confirm Unsubscribe" + subscribe_title: "구독" + unsubscribe: "구독 해제" + confirm_unsubscribe: "구독 해제 확인" # never_mind: "Never Mind, I Still Love You" # thank_you_months_prefix: "Thank you for supporting us these last" # thank_you_months_suffix: "months." -# thank_you: "Thank you for supporting CodeCombat." + thank_you: "CodeCombat을 도와주셔서 감사합니다." # sorry_to_see_you_go: "Sorry to see you go! Please let us know what we could have done better." # unsubscribe_feedback_placeholder: "O, what have we done?" # parent_button: "Ask your parent" @@ -501,24 +501,24 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t # read_only: "read-only" # action: "Action" # spell: "Spell" -# action_name: "name" + action_name: "이름" # action_cooldown: "Takes" # action_specific_cooldown: "Cooldown" -# action_damage: "Damage" -# action_range: "Range" + action_damage: "데미지" + action_range: "사거리" # action_radius: "Radius" # action_duration: "Duration" -# example: "Example" -# ex: "ex" # Abbreviation of "example" + example: "예제" + ex: "예시" # Abbreviation of "example" # current_value: "Current Value" # default_value: "Default value" # parameters: "Parameters" -# returns: "Returns" + returns: "뒤로가기" # granted_by: "Granted by" # save_load: -# granularity_saved_games: "Saved" -# granularity_change_history: "History" + granularity_saved_games: "저장됨" + granularity_change_history: "기록" options: # general_options: "General Options" # Check out the Options tab in the Game Menu while playing a level @@ -591,15 +591,15 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t # must_be_logged: "You must be logged in first. Please create an account or log in from the menu above." # retrieving: "Retrieving information..." # being_reviewed_1: "Your application for a free trial is being" -# being_reviewed_2: "reviewed." + being_reviewed_2: "검토됨." # approved_1: "Your application for a free trial was" # approved_2: "approved!" # approved_4: "You can now enroll your students on the" # approved_5: "courses" -# approved_6: "page." + approved_6: "페이지." # denied_1: "Your application for a free trial has been" -# denied_2: "denied." -# contact_1: "Please contact" + denied_2: "거절됨." + contact_1: "연락해주세요." # contact_2: "if you have further questions." # description_1: "We offer free trials to teachers. You will be given 2 free enrollments which can be used to enroll students in paid courses." # description_1b: "You can find more information on our" @@ -620,7 +620,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t versions: save_version_title: "새로운 버전을 저장합니다" new_major_version: "신규 버전" -# submitting_patch: "Submitting Patch..." + submitting_patch: "패치 적용중..." cla_prefix: "변경사항을 저장하기 위해서는, 먼저 계약사항에 동의 하셔야 합니다." cla_url: "CLA" cla_suffix: "." From cba6a5a7b55169bb8122874e11195037f95e694c Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Thu, 14 Jan 2016 11:35:55 -0800 Subject: [PATCH 02/11] Update FacebookHandler test --- test/app/core/social-handlers/FacebookHandler.spec.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/app/core/social-handlers/FacebookHandler.spec.coffee b/test/app/core/social-handlers/FacebookHandler.spec.coffee index 24b2dbefc..201c6e8ce 100644 --- a/test/app/core/social-handlers/FacebookHandler.spec.coffee +++ b/test/app/core/social-handlers/FacebookHandler.spec.coffee @@ -69,7 +69,7 @@ describe 'lib/FacebookHandler.coffee', -> expect(FB.api).toHaveBeenCalled() apiArgs = FB.api.calls.argsFor(0) expect(apiArgs[0]).toBe('/me') - apiArgs[1](mockMe) # sending the 'response' + apiArgs[2](mockMe) # sending the 'response' request = jasmine.Ajax.requests.mostRecent() expect(request).toBeDefined() params = JSON.parse request.params From c220ba9de40e0c9f07e396a487bbc2aac4a335ee Mon Sep 17 00:00:00 2001 From: Matt Lott Date: Thu, 14 Jan 2016 15:30:53 -0800 Subject: [PATCH 03/11] School analytics scripts --- .../analytics/mongodb/queries/schoolCounts.js | 43 +++++ .../mongodb/queries/userTypesBySchool.js | 182 ++++++++++++++++++ 2 files changed, 225 insertions(+) create mode 100644 scripts/analytics/mongodb/queries/schoolCounts.js create mode 100644 scripts/analytics/mongodb/queries/userTypesBySchool.js diff --git a/scripts/analytics/mongodb/queries/schoolCounts.js b/scripts/analytics/mongodb/queries/schoolCounts.js new file mode 100644 index 000000000..b8aa2f054 --- /dev/null +++ b/scripts/analytics/mongodb/queries/schoolCounts.js @@ -0,0 +1,43 @@ +// Print out school user counts + +// Usage: +// mongo
:/