diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee index 127aed7f3..76b6f2891 100644 --- a/app/locale/ru.coffee +++ b/app/locale/ru.coffee @@ -4,7 +4,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi no_ie: "CodeCombat не работает в IE8 или более старых версиях. Нам очень жаль!" # Warning that only shows up in IE8 and older no_mobile: "CodeCombat не приспособлен для работы на мобильных устройствах и может не работать!" # Warning that shows up on mobile devices play: "Играть" # The big play button that opens up the campaign view. -# play_campaign_version: "Play Campaign Version" # Shows up under big play button if you only play /courses + play_campaign_version: "Играть в кампанию" # Shows up under big play button if you only play /courses old_browser: "Ой, ваш браузер слишком стар для запуска CodeCombat. Извините!" # Warning that shows up on really old Firefox/Chrome/Safari old_browser_suffix: "Вы всё равно можете попробовать, но, скорее всего, это не будет работать." ipad_browser: "Плохие новости: CodeCombat не запускается в браузере IPad. Хорошие новости: наше нативное приложение для IPad ожидает одобрения от Apple." @@ -17,7 +17,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi nav: play: "Уровни" # The top nav bar entry where players choose which levels to play community: "Сообщество" -# courses: "Courses" + courses: "Курсы" editor: "Редактор" blog: "Блог" forum: "Форум" @@ -52,7 +52,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi play: play_as: "Играть за " # Ladder page -# compete: "Compete!" # Course details page + compete: "Соревноваться!" # Course details page spectate: "Наблюдать" # Ladder page players: "игроки" # Hover over a level on /play hours_played: "часов сыграно" # Hover over a level on /play @@ -75,7 +75,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi subscription_required: "Требуется подписка" anonymous: "Неизвестный игрок" level_difficulty: "Сложность: " -# play_classroom_version: "Play Classroom Version" # Choose a level in campaign version that you also can play in one of your courses + play_classroom_version: "Играть в версию для работы в классе" # Choose a level in campaign version that you also can play in one of your courses campaign_beginner: "Кампания для новичков" awaiting_levels_adventurer_prefix: "Мы выпускаем новые уровни каждую неделю." awaiting_levels_adventurer: "Зарегистрируйтесь в качестве Искателя приключений" @@ -83,7 +83,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi adjust_volume: "Регулировать громкость" campaign_multiplayer: "Арены для мультиплеера" campaign_multiplayer_description: "... в которых вы соревнуетесь в программировании с другими игроками." -# campaign_old_multiplayer: "(Deprecated) Old Multiplayer Arenas" + campaign_old_multiplayer: "(Устаревшее) Старые многопользовательские арены" # campaign_old_multiplayer_description: "Relics of a more civilized age. No simulations are run for these older, hero-less multiplayer arenas." share_progress_modal: @@ -114,9 +114,9 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi log_in: "вход с паролем" required: "Войдите для того, чтобы продолжить." login_switch: "Уже есть аккаунт?" -# school_name: "School Name and City" -# optional: "optional" -# school_name_placeholder: "Example High School, Springfield, IL" + school_name: "Название школы and город" + optional: "не обязательно" + school_name_placeholder: "Школа № 2, город Электросталь, Московская область" recover: recover_account_title: "Восстановить аккаунт" @@ -166,7 +166,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi withdrawn: "Отозвано" accept: "Принять" reject: "Отклонить" -# withdraw: "Withdraw" + withdraw: "Изъять" submitter: "Податель" submitted: "Представлено" commit_msg: "Сопроводительное сообщение" @@ -221,10 +221,10 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi years: "лет" play_level: -# completed_level: "Completed Level:" -# course: "Course:" + completed_level: "Завершённый уровень:" + course: "Курс:" done: "Готово" -# next_level: "Next Level:" + next_level: "Следующий уровень:" next_game: "Следующая игра" show_menu: "Показать меню игры" home: "На главную" # Not used any more, will be removed soon. @@ -342,7 +342,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi tip_free_your_mind: "Отвлекись от всего, Нео. Страх, неверие, сомнения отбрось — очисти свой разум. - Morpheus" tip_strong_opponents: "Даже сильнейший противник имеет слабость. - Itachi Uchiha" tip_paper_and_pen: "Прежде чем начать программировать, вы всегда можете попробовать с листом бумаги и ручкой." -# tip_solve_then_write: "First, solve the problem. Then, write the code. - John Johnson" + tip_solve_then_write: "Сперва реши задачу, затем пиши код. - Джон Джонсон" game_menu: inventory_tab: "Инвентарь" @@ -594,15 +594,15 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi being_reviewed_2: "на рассмотрении." # {change} approved_1: "Ваша заявка на бесплатную пробную подписку была" # {change} approved_2: "утверждена." # {change} -# approved_4: "You can now enroll your students on the" -# approved_5: "courses" -# approved_6: "page." + approved_4: "Теперь вы можете регистрировать ваших учеников на" + approved_5: "курсы" + approved_6: "страница." denied_1: "Ваша заявка на бесплатную пробную подписку была" # {change} denied_2: "отклонена." # {change} contact_1: "Пожалуйста, свяжитесь с" contact_2: ", если у вас остались вопросы." description_1: "Мы предлагаем бесплатные подписки учителям в целях ознакомления. Вы можете найти больше информации на нашей странице" -# description_1b: "You can find more information on our" + description_1b: "Вы можете найти больше информации на" description_2: "учителей" description_3: "" description_4: "Пожалуйста, заполните эту маленькую анкету и мы вышлем вам инструкции по установке на email." @@ -736,7 +736,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi subs_only: "только для подписчиков" create_clan: "Создать новый клан" private_preview: "Превью" -# private_clans: "Private Clans" + private_clans: "Тайные кланы" public_clans: "Публичные кланы" my_clans: "Мои кланы" clan_name: "Имя клана" @@ -768,7 +768,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi started_2: "Начат" not_started_2: "Не начат" view_solution: "Нажмите, чтобы увидеть решение." -# view_attempt: "Click to view attempt." + view_attempt: "Нажмите чтобы посмотреть попытку." latest_achievement: "Последнее достижение" playtime: "Время игры" last_played: "Последняя игра" @@ -780,17 +780,17 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi # track_concepts3b: "Track levels completed for each member" # track_concepts4a: "See your students'" # track_concepts4b: "See your members'" -# track_concepts5: "solutions" -# track_concepts6a: "Sort students by name or progress" -# track_concepts6b: "Sort members by name or progress" -# track_concepts7: "Requires invitation" -# track_concepts8: "to join" -# private_require_sub: "Private clans require a subscription to create or join." + track_concepts5: "решения" + track_concepts6a: "Сортировать студентов по имени или прогрессу" + track_concepts6b: "Сортировать членов по имени или прогрессу" + track_concepts7: "Требуется приглашение" + track_concepts8: "вступить" + private_require_sub: "Требуется подписка чтобы создать тайный клан или вступить в него." courses: course: "Курс" courses: "Курсы" -# create_new_class: "Create New Class" + create_new_class: "Создать новый класс" not_enrolled: "Вы не записаны на этот курс." visit_pref: "Пожалуйста, зайдите на" visit_suf: "страницу для записи." @@ -865,151 +865,151 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi topics: "Темы" hours_content: "Много часов материала:" get_free: "Получить бесплатный курс" -# enroll_paid: "Enroll Students in Paid Courses" -# you_have1: "You have" + enroll_paid: "Записать учеников на платные курсы" + you_have1: "У вас есть" # you_have2: "unused paid enrollments" # use_one: "Use 1 paid enrollment for" # use_multiple: "Use paid enrollments for the following students:" -# already_enrolled: "already enrolled" + already_enrolled: "уже зачислен" # licenses_remaining: "licenses remaining:" # insufficient_enrollments: "insufficient paid enrollments" # enroll_students: "Enroll Students" # get_enrollments: "Get More Enrollments" -# change_language: "Change Course Language" -# keep_using: "Keep Using" -# switch_to: "Switch To" -# greetings: "Greetings!" -# learn_p: "Learn Python" -# learn_j: "Learn JavaScript" -# language_cannot_change: "Language cannot be changed once students join a class." -# back_classrooms: "Back to my classrooms" -# back_courses: "Back to my courses" -# edit_details: "Edit class details" + change_language: "Изменить язык программирования курса" + keep_using: "Продолжить использовать" + switch_to: "Переключить на" + greetings: "Поздравления!" + learn_p: "Изучать Python" + learn_j: "Изучать JavaScript" + language_cannot_change: "Язык не может быть изменён после того как ученик присоединился к классу." + back_classrooms: "Назад к моим классам" + back_courses: "Назад к моим курсам" + edit_details: "Редактировать описание класса" # enrolled_courses: "enrolled in paid courses:" # purchase_enrollments: "Purchase Enrollments" -# remove_student: "remove student" + remove_student: "удалить ученика" # assign: "Assign" # to_assign: "to assign paid courses." -# teacher: "Teacher" -# complete: "Complete" + teacher: "Учитель" + complete: "Завершить" # none: "None" -# save: "Save" -# play_campaign_title: "Play the Campaign" + save: "Сохранить" + play_campaign_title: "Играть в кампанию" # play_campaign_description: "You’re ready to take the next step! Explore hundreds of challenging levels, learn advanced programming skills, and compete in multiplayer arenas!" -# create_account_title: "Create an Account" + create_account_title: "Создать учётную запись" # create_account_description: "Sign up for a FREE CodeCombat account and gain access to more levels, more programming skills, and more fun!" # preview_campaign_title: "Preview Campaign" # preview_campaign_description: "Take a sneak peek at all that CodeCombat has to offer before signing up for your FREE account." -# arena: "Arena" -# arena_soon_title: "Arena Coming Soon" + arena: "Арена" + arena_soon_title: "Арена скоро появится" # arena_soon_description: "We are working on a multiplayer arena for classrooms at the end of" # not_enrolled1: "Not enrolled" -# not_enrolled2: "Ask your teacher to enroll you in the next course." -# next_course: "Next Course" -# coming_soon1: "Coming soon" + not_enrolled2: "Попросите учителя зачислить вас на следующий курс." + next_course: "Следующий курс" + coming_soon1: "Скоро появится" # coming_soon2: "We are hard at work making more courses for you!" # available_levels: "Available Levels" -# welcome_to_courses: "Adventurers, welcome to Courses!" -# ready_to_play: "Ready to play?" -# start_new_game: "Start New Game" -# play_now_learn_header: "Play now to learn" -# play_now_learn_1: "basic syntax to control your character" -# play_now_learn_2: "while loops to solve pesky puzzles" -# play_now_learn_3: "strings & variables to customize actions" -# play_now_learn_4: "how to defeat an ogre (important life skills!)" -# welcome_to_page: "Welcome to your Courses page!" -# completed_hoc: "Amazing! You've completed the Hour of Code course!" -# ready_for_more_header: "Ready for more? Play the campaign mode!" -# ready_for_more_1: "Use gems to unlock new items!" + welcome_to_courses: "Искатели приключений, добро пожаловать на курсы!" + ready_to_play: "Готовы приступить к игре?" + start_new_game: "Начать новую игру" + play_now_learn_header: "Начать обучающую игру" + play_now_learn_1: "базовый синтаксис управления персонажем" + play_now_learn_2: "циклы while чтобы решать противные головоломки" + play_now_learn_3: "строки и переменные чтобы настраивать действия" + play_now_learn_4: "Как победить огра (важные жизненные навыки!)" + welcome_to_page: "Добро пожаловать на вашу страницу курсов!" + completed_hoc: "Изумительно! Вы прошли курс Час кода!" + ready_for_more_header: "Хотите продолжить? Играйте в режиме кампании!" + ready_for_more_1: "Используйте самоцветы чтобы разблокировать новые предметы!" # ready_for_more_2: "Play through brand new worlds and challenges" -# ready_for_more_3: "Learn even more programming!" -# saved_games: "Saved Games" -# hoc: "Hour of Code" -# my_classes: "My Classes" -# class_added: "Class successfully added!" -# view_class: "view class" -# view_levels: "view levels" -# join_class: "Join A Class" + ready_for_more_3: "Учитесь программировнию дальше!" + saved_games: "Сохранённые игры" + hoc: "Час кода" + my_classes: "Мои классы" + class_added: "Класс успешно добавлен!" + view_class: "смотреть класс" + view_levels: "смотреть уровни" + join_class: "Присоединиться к классу" # ask_teacher_for_code: "Ask your teacher if you have a CodeCombat class code! If so, enter it below:" # enter_c_code: "" -# join: "Join" +# join: "Присоединиться" # joining: "Joining class" -# course_complete: "Course Complete" -# play_arena: "Play Arena" -# start: "Start" -# last_level: "Last Level" -# welcome_to_hoc: "Adventurers, welcome to our Hour of Code!" + course_complete: "Курс завершён" + play_arena: "Играть Арену" +# start: "Старт" +# last_level: "Последний уровень" + welcome_to_hoc: "Искатели приключений, добро пожаловать на Час кода!" # logged_in_as: "Logged in as:" -# not_you: "Not you?" -# welcome_back: "Hi adventurer, welcome back!" +# not_you: "Не вы?" +# welcome_back: "Привет, искатель приключений, добро пожаловать!" # continue_playing: "Continue Playing" -# more_options: "More options:" -# option1_header: "Option 1: Invite students via email" + more_options: "Другие варианты:" + option1_header: "Вариант 1: Пригласить учеников по email" # option1_body: "Students will automatically be sent an invitation to join this class, and will need to create an account with a username and password." -# option2_header: "Option 2: Send URL to your students" + option2_header: "Вариант 2: Послать URL вашим ученикам" # option2_body: "Students will be asked to enter an email address, username and password to create an account." -# option3_header: "Option 3: Direct students to codecombat.com/courses" + option3_header: "Вариант 3: Направить учеников на codecombat.com/courses" # option3_body: "Give students the following passcode to enter along with an email address, username and password when they create an account." # thank_you_pref: "Thank you for your purchase! You can now assign" # thank_you_suff: "more students to paid courses." # return_to_class: "Return to classroom" -# return_to_course_man: "Return to course management." + return_to_course_man: "Вернуться к управлению курсом." # students_not_enrolled: "students not enrolled" -# total_all_classes: "Total Across All Classes" + total_all_classes: "Общее по всем классам" # how_many_enrollments: "How many additional paid enrollments do you need?" # each_student_access: "Each student in a class will get access to Courses 2-4 once they are enrolled in paid courses. You may assign each course to each student individually." # purchase_now: "Purchase Now" # enrollments: "enrollments" -# remove_student1: "Remove Student" + remove_student1: "Удалить ученика" # are_you_sure: "Are you sure you want to remove this student from this class?" # remove_description1: "Student will lose access to this classroom and assigned classes. Progress and gameplay is NOT lost, and the student can be added back to the classroom at any time." # remove_description2: "The activated paid license will not be returned." -# keep_student: "Keep Student" + keep_student: "Оставить ученика" # removing_user: "Removing user" # to_join_ask: "To join a class, ask your teacher for an unlock code." # join_this_class: "Join Class" -# enter_here: "" +# enter_here: "<Ввести здесь код разблокировки>" # successfully_joined: "Successfully joined" # click_to_start: "Click here to start taking" -# my_courses: "My Courses" -# classroom: "Classroom" + my_courses: "Мои курсы" + classroom: "Класс" # use_school_email: "use your school email if you have one" # unique_name: "a unique name no one has chosen" # pick_something: "pick something you can remember" # class_code: "Class Code" -# optional_ask: "optional - ask your teacher to give you one!" -# optional_school: "optional - what school do you go to?" -# start_playing: "Start Playing" -# skip_this: "Skip this, I'll create an account later!" -# welcome: "Welcome" -# getting_started: "Getting Started with Courses" + optional_ask: "Как вариант - попросите учителя дать вам какой-нибудь!" + optional_school: "Не обязательное - в какую школу вы ходите?" + start_playing: "Начать играть" + skip_this: "Пропустить это, я создам учетную запись позже!" + welcome: "Добро пожаловать" + getting_started: "Начать проходить курсы" # download_getting_started: "Download Getting Started Guide [PDF]" # getting_started_1: "Create a new class by clicking the green 'Create New Class' button below." # getting_started_2: "Once you've created a class, click the blue 'Add Students' button." # getting_started_3: "You'll see student's progress below as they sign up and join your class." -# additional_resources: "Additional Resources" -# additional_resources_1_pref: "Download/print our" + additional_resources: "Дополнительные ресурсы" + additional_resources_1_pref: "Скачать/распечатать наш" # additional_resources_1_mid: "Course 1 Teacher's Guide" # additional_resources_1_suff: "explanations and solutions to each level." # additional_resources_2_pref: "Complete our" # additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses." -# additional_resources_3_pref: "Visit our" + additional_resources_3_pref: "Посетить наш" # additional_resources_3_mid: "Teacher Forums" # additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat." # additional_resources_4_pref: "Check out our" # additional_resources_4_mid: "Schools Page" # additional_resources_4_suff: "to learn more about CodeCombat's classroom offerings." -# your_classes: "Your Classes" + your_classes: "Ваши классы" # no_classes: "No classes yet!" -# create_new_class1: "create new class" + create_new_class1: "создать новый класс" # available_courses: "Available Courses" # unused_enrollments: "Unused enrollments available:" # students_access: "All students get access to Introduction to Computer Science for free. One enrollment per student is required to assign them to paid CodeCombat courses. A single student does not need multiple enrollments to access all paid courses." # active_courses: "active courses" -# no_students: "No students yet!" -# add_students1: "add students" -# view_edit: "view/edit" -# students_enrolled: "students enrolled" + no_students: "Ещё нет учеников!" + add_students1: "добавить учеников" + view_edit: "смотреть/редактировать" + students_enrolled: "учеников зачислено" # length: "Length:" classes: @@ -1254,11 +1254,11 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi rules: "Правила" winners: "Победители" league: "Лига" -# red_ai: "Red CPU" # "Red AI Wins", at end of multiplayer match playback -# blue_ai: "Blue CPU" -# wins: "Wins" # At end of multiplayer match playback -# humans: "Red" # Ladder page display team name -# ogres: "Blue" + red_ai: "CPU красного" # "Red AI Wins", at end of multiplayer match playback + blue_ai: "CPU синего" + wins: "Победы" # At end of multiplayer match playback + humans: "Красный" # Ladder page display team name + ogres: "Синий" user: stats: "Характеристики" @@ -1406,16 +1406,16 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi campaigns: "Кампании" poll: "Опрос" user_polls_record: "История опросов" -# course: "Course" -# courses: "Courses" -# course_instance: "Course Instance" -# course_instances: "Course Instances" -# classroom: "Classroom" -# classrooms: "Classrooms" -# clan: "Clan" -# clans: "Clans" -# members: "Members" -# users: "Users" + course: "Курс" + courses: "Курсы" + course_instance: "Экземпляр курса" + course_instances: "Экземпляры курса" + classroom: "Класс" + classrooms: "Классы" + clan: "Клан" + clans: "Кланы" + members: "Члены" + users: "пользователи" concepts: advanced_strings: "Продвинутые строки" diff --git a/package.json b/package.json index 1f3cd320f..49d9aa3fc 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "aether": "~0.4.0", "async": "0.2.x", "aws-sdk": "~2.0.0", - "bayesian-battle": "0.0.x", + "bayesian-battle": "https://github.com/codecombat/bayesian-battle/tarball/master", "coffee-script": "1.9.x", "connect": "2.7.x", "express": "~3.0.6", diff --git a/test/app/views/editor/level/EditorLevelView.spec.coffee b/test/app/views/editor/level/EditorLevelView.spec.coffee index 35beea837..521630d93 100644 --- a/test/app/views/editor/level/EditorLevelView.spec.coffee +++ b/test/app/views/editor/level/EditorLevelView.spec.coffee @@ -8,6 +8,7 @@ describe 'LevelEditView', -> view = new LevelEditView({}, 'something') request = jasmine.Ajax.requests.first() request.respondWith {status: 200, responseText: JSON.stringify(emptyLevel)} + me.set('anonymous', false) # otherwise button may be disabled an not fire view.render() spyOn(view, 'openModalView') view.$el.find('#revert-button').click()