From 37b04c10cbaee5cb0e16aeddf88f515cf5cd06ea Mon Sep 17 00:00:00 2001 From: enricpc Date: Fri, 26 Sep 2014 09:44:10 +0200 Subject: [PATCH 1/3] Update ca.coffee --- app/locale/ca.coffee | 88 ++++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/app/locale/ca.coffee b/app/locale/ca.coffee index ba9798722..8fa784e14 100644 --- a/app/locale/ca.coffee +++ b/app/locale/ca.coffee @@ -90,8 +90,8 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr creating: "Creant Compte..." sign_up: "Registrar-se" log_in: "Iniciar sessió amb la teva contrasenya" -# social_signup: "Or, you can sign up through Facebook or G+:" -# required: "You need to log in before you can go that way." + social_signup: "O, pots iniciar sesió desde Facebook o G+:" + required: "Neccesites iniciar sesió abans ." home: slogan: "Aprén a programar tot Jugant" @@ -117,7 +117,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr adventurer_forum: "El fòrum de l'aventurer" adventurer_suffix: "." campaign_beginner: "Campanya del principiant" -# campaign_old_beginner: "Old Beginner Campaign" + campaign_old_beginner: "Antiga campanya del principiant" campaign_beginner_description: "... on aprens la bruixeria de la programació." campaign_dev: "Nivells difícils aleatoris" campaign_dev_description: "... on aprens a interactuar amb la interfície tot fent coses un pèl més difícils." @@ -140,8 +140,8 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr next: "Següent" previous: "Anterior" choose_inventory: "Equipar objectes" -# older_campaigns: "Older Campaigns" -# anonymous: "Anonymous Player" + older_campaigns: "Campanyes antigues" + anonymous: "Jugador anònim" items: armor: "Armadura" @@ -180,13 +180,13 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr group: "Grup" clothes: "Roba" # trim: "Trim" -# cloud: "Cloud" + cloud: "Nuvol" team: "Equip" # spell: "Spell" boots: "Botes" # hue: "Hue" -# saturation: "Saturation" -# lightness: "Lightness" + saturation: "Saturació" + lightness: "Brillantor" account_settings: title: "Configuració de la compta" @@ -218,7 +218,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # contribute_page: "contribute page" # contribute_suffix: " to find out more." # email_toggle: "Toggle All" -# error_saving: "Error Saving" + error_saving: "Error en desar" saved: "Canvis desats" password_mismatch: "Les contrasenyes no coincideixen." password_repeat: "Siusplau, repetiu la contrasenya." @@ -231,9 +231,9 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr account_profile: settings: "Configuració" edit_profile: "Modifica el perfil" -# done_editing: "Done Editing" + done_editing: "Acaba l'edició" # profile_for_prefix: "Profile for " -# profile_for_suffix: "" + profile_for_suffix: "" # featured: "Featured" # not_featured: "Not Featured" looking_for: "Buscant:" @@ -310,7 +310,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # education_header: "Recount your academic ordeals" # education_blurb: "List your academic ordeals." education_school: "Escola" -# education_school_help: "Name of your school." + education_school_help: "Nom de la teva escola." # education_degree: "Degree" # education_degree_help: "What was your degree and field of study?" # education_duration: "Dates" @@ -320,7 +320,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # our_notes: "CodeCombat's Notes" # remarks: "Remarks" projects: "Projectes" -# projects_header: "Add 3 projects" + projects_header: "Afegeix 3 projectes" # projects_header_2: "Projects (Top 3)" # projects_blurb: "Highlight your projects to amaze employers." project_name: "Nom del projecte" @@ -329,7 +329,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # project_description_help: "Briefly describe the project." project_picture: "Imatge" # project_picture_help: "Upload a 230x115px or larger image showing off the project." -# project_link: "Link" + project_link: "Enllaç" # project_link_help: "Link to the project." # player_code: "Player Code" @@ -342,7 +342,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # filter_visa_yes: "US Authorized" # filter_visa_no: "Not Authorized" # filter_education_top: "Top School" -# filter_education_other: "Other" + filter_education_other: "Altres" # filter_role_web_developer: "Web Developer" # filter_role_software_developer: "Software Developer" # filter_role_mobile_developer: "Mobile Developer" @@ -351,7 +351,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # filter_experience_junior: "Junior" # filter_experience_recent_grad: "Recent Grad" # filter_experience_student: "College Student" -# filter_results: "results" + filter_results: "resultats" # start_hiring: "Start hiring." # reasons: "Three reasons you should hire through us:" # everyone_looking: "Everyone here is looking for their next opportunity." @@ -380,7 +380,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr play_level: done: "Fet" customize_wizard: "Personalitza el teu bruixot" -# home: "Home" + home: "Inici" # skip: "Skip" game_menu: "Menu de joc" guide: "Guia" @@ -388,9 +388,9 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr goals: "Objectius" goal: "Objectiu" success: "Exit!" -# incomplete: "Incomplete" -# timed_out: "Ran out of time" -# failing: "Failing" + incomplete: "Incomplet" + timed_out: "S'ha acabat el temps" + failing: "Fallant" # action_timeline: "Action Timeline" # click_to_select: "Click on a unit to select it." # reload_title: "Reload All Code?" @@ -404,14 +404,14 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # victory_return_to_ladder: "Return to Ladder" victory_play_next_level: "Jugar el següent nivell" victory_play_continue: "Continuar" -# victory_go_home: "Go Home" -# victory_review: "Tell us more!" + victory_go_home: "Tornar a l'inici" + victory_review: "Diguens més!" # victory_hour_of_code_done: "Are You Done?" # victory_hour_of_code_done_yes: "Yes, I'm finished with my Hour of Code™!" guide_title: "Guia" # tome_minion_spells: "Your Minions' Spells" # tome_read_only_spells: "Read-Only Spells" -# tome_other_units: "Other Units" + tome_other_units: "Altres unitats" # tome_cast_button_castable: "Cast Spell" # Temporary, if tome_cast_button_run isn't translated. # tome_cast_button_casting: "Casting" # Temporary, if tome_cast_button_running isn't translated. # tome_cast_button_cast: "Spell Cast" # Temporary, if tome_cast_button_ran isn't translated. @@ -420,15 +420,15 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # 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. -# tome_select_method: "Select a Method" + tome_select_method: "Selecciona un mètode" # tome_see_all_methods: "See all methods you can edit" # Title text for method list selector (shown when there are multiple programmable methdos). # tome_select_a_thang: "Select Someone for " # tome_available_spells: "Available Spells" # tome_your_skills: "Your Skills" -# hud_continue: "Continue (shift+space)" + hud_continue: "Continuar (shift+espai)" # spell_saved: "Spell Saved" # skip_tutorial: "Skip (esc)" -# keyboard_shortcuts: "Key Shortcuts" + keyboard_shortcuts: "Dreceres del teclat" # loading_ready: "Ready!" loading_start: "Comença el nivell" # tip_insert_positions: "Shift+Click a point on the map to insert it into the spell editor." @@ -438,7 +438,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # tip_open_source: "CodeCombat is 100% open source!" # tip_beta_launch: "CodeCombat launched its beta in October, 2013." # tip_js_beginning: "JavaScript is just the beginning." -# tip_think_solution: "Think of the solution, not the problem." + tip_think_solution: "Pensa en la solució,no en el problema." # tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra" # tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis" # tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra" @@ -462,15 +462,15 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # tip_hofstadters_law: "Hofstadter's Law: It always takes longer than you expect, even when you take into account Hofstadter's Law." # tip_premature_optimization: "Premature optimization is the root of all evil. - Donald Knuth" # tip_brute_force: "When in doubt, use brute force. - Ken Thompson" -# time_current: "Now:" + time_current: "Ara:" # time_total: "Max:" -# time_goto: "Go to:" + time_goto: "Ves a:" infinite_loop_try_again: "Tornar a intentar" infinite_loop_reset_level: "Reiniciar nivell" # infinite_loop_comment_out: "Comment Out My Code" game_menu: -# inventory_tab: "Inventory" + inventory_tab: "Inventari" choose_hero_tab: "Recomençar nivell" save_load_tab: "Desa/Carrega" options_tab: "Opcions" @@ -480,7 +480,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # choose_hero_caption: "Choose hero, language" # save_load_caption: "... and view history" options_caption: "Edita la configuració" -# guide_caption: "Docs and tips" + guide_caption: "Documents i pistes" multiplayer_caption: "Juga amb amics!" inventory: @@ -524,11 +524,11 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # editor_config_behaviors_label: "Smart Behaviors" # editor_config_behaviors_description: "Autocompletes brackets, braces, and quotes." -# guide: + guide: # temp: "Temp" multiplayer: -# multiplayer_title: "Multiplayer Settings" + multiplayer_title: "Configuració multijugador" multiplayer_toggle: "Activar multijugador" # multiplayer_toggle_description: "Allow others to join your game." # multiplayer_link_description: "Give this link to anyone to have them join you." @@ -577,7 +577,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # clas: "CLAs" community: -# main_title: "CodeCombat Community" + main_title: "Comunitat CodeCombat" # introduction: "Check out the ways you can get involved below and decide what sounds the most fun. We look forward to working with you!" # level_editor_prefix: "Use the CodeCombat" # level_editor_suffix: "to create and edit levels. Users have created levels for their classes, friends, hackathons, students, and siblings. If create a new level sounds intimidating you can start by forking one of ours!" @@ -592,7 +592,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr social_twitter: "Segueix CodeCombat al Twitter" # social_gplus: "Join CodeCombat on Google+" # social_hipchat: "Chat with us in the public CodeCombat HipChat room" -# contribute_to_the_project: "Contribute to the project" + contribute_to_the_project: "Contribueix al projecte" editor: # main_title: "CodeCombat Editors" @@ -611,7 +611,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # generate_terrain: "Generate Terrain" more: "Més" wiki: "Wiki" -# live_chat: "Live Chat" + live_chat: "Xat en directe" # level_some_options: "Some Options?" # level_tab_thangs: "Thangs" # level_tab_scripts: "Scripts" @@ -625,7 +625,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # level_tab_thangs_add: "Add Thangs" delete: "Esborrar" duplicate: "Duplicar" -# level_settings_title: "Settings" + level_settings_title: "Configuració" # level_component_tab_title: "Current Components" # level_component_btn_new: "Create New Component" # level_systems_tab_title: "Current Systems" @@ -658,15 +658,15 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # achievement_query_goals: "Key achievement off of level goals" # level_completion: "Level Completion" -# article: + article: # edit_btn_preview: "Preview" # edit_article_title: "Edit Article" general: # and: "and" name: "Nom" -# date: "Date" -# body: "Body" + date: "Data" + body: "Cos" version: "Versió" # commit_msg: "Commit Message" # version_history: "Version History" @@ -1018,7 +1018,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # moved_index: "Moved Index" # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" -# no_changes: "No Changes" + no_changes: "Sense canvis" user: # stats: "Stats" @@ -1030,7 +1030,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr status_completed: "Complet" status_unfinished: "Inacabat" no_singleplayer: "Encara no s'han jugat nivells individuals." -# no_multiplayer: "No Multiplayer games played yet." + no_multiplayer: "Encara no s'han jugat nivells multijugador." # no_achievements: "No Achievements earned yet." # favorite_prefix: "Favorite language is " # favorite_postfix: "." @@ -1039,10 +1039,10 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # last_earned: "Last Earned" # amount_achieved: "Amount" # achievement: "Achievement" -# category_contributor: "Contributor" + category_contributor: "Contribuidor" # category_miscellaneous: "Miscellaneous" category_levels: "Nivells" -# category_undefined: "Uncategorized" + category_undefined: "Sense categoria" # current_xp_prefix: "" current_xp_postfix: " en total" # new_xp_prefix: "" From f0408a85d3ad7f4f5c14ae36677e00811fc51c0f Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Fri, 26 Sep 2014 03:43:35 -0700 Subject: [PATCH 2/3] Recommented a couple ca.coffee section headers that aren't started yet. --- app/locale/ca.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/locale/ca.coffee b/app/locale/ca.coffee index 8fa784e14..7ee4f00e5 100644 --- a/app/locale/ca.coffee +++ b/app/locale/ca.coffee @@ -524,7 +524,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # editor_config_behaviors_label: "Smart Behaviors" # editor_config_behaviors_description: "Autocompletes brackets, braces, and quotes." - guide: +# guide: # temp: "Temp" multiplayer: @@ -658,7 +658,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # achievement_query_goals: "Key achievement off of level goals" # level_completion: "Level Completion" - article: +# article: # edit_btn_preview: "Preview" # edit_article_title: "Edit Article" From cf9cf6f98bfa3c0f874b955f950b2d1a3c655aab Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Fri, 26 Sep 2014 03:52:57 -0700 Subject: [PATCH 3/3] Stopped locking levels for now, since the achievements aren't quite unlocking them correctly. --- app/models/User.coffee | 6 +++--- app/views/play/WorldMapView.coffee | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/models/User.coffee b/app/models/User.coffee index 9a1ec0846..86e31bd77 100644 --- a/app/models/User.coffee +++ b/app/models/User.coffee @@ -73,6 +73,6 @@ module.exports = class User extends CocoModel gemsSpent = sum(purchased.heroes) + sum(purchased.items) + sum(purchased.levels) gemsEarned + gemsPurchased - gemsSpent - earnedHero: (heroOriginal) -> heroOriginal in me.get('earned')?.heroes ? [] - earnedItem: (itemOriginal) -> itemOriginal in me.get('earned')?.items ? [] - earnedLevel: (levelOriginal) -> levelOriginal in me.get('earned')?.levels ? [] + earnedHero: (heroOriginal) -> heroOriginal in (me.get('earned')?.heroes ? []) + earnedItem: (itemOriginal) -> itemOriginal in (me.get('earned')?.items ? []) + earnedLevel: (levelOriginal) -> levelOriginal in (me.get('earned')?.levels ? []) diff --git a/app/views/play/WorldMapView.coffee b/app/views/play/WorldMapView.coffee index 99511e68c..703b1eb8b 100644 --- a/app/views/play/WorldMapView.coffee +++ b/app/views/play/WorldMapView.coffee @@ -68,7 +68,8 @@ module.exports = class WorldMapView extends RootView for level, index in campaign.levels level.x ?= 10 + 80 * Math.random() level.y ?= 10 + 80 * Math.random() - level.locked = index > 0 and not me.earnedLevel level.original + #level.locked = index > 0 and not me.earnedLevel level.original + level.locked = false # Not working yet, but time for sleep. context.levelStatusMap = @levelStatusMap context.levelPlayCountMap = @levelPlayCountMap context.isIPadApp = application.isIPadApp