diff --git a/achievement_fixtures.js b/achievement_fixtures.js deleted file mode 100644 index 56b6fb42f..000000000 --- a/achievement_fixtures.js +++ /dev/null @@ -1,12 +0,0 @@ -// Fixtures - -db.achievements.insert({ - query: '{"level.original": "52d97ecd32362bc86e004e87"}', - index: true, - slug: 'dungeon-arena-started', - name: 'Dungeon Arena started', - worth: 1, - collection: 'level.session', - description: 'Started playing Dungeon Arena.', - userField: 'creator' -}); diff --git a/app/Router.coffee b/app/Router.coffee index ca6af592b..98229b552 100644 --- a/app/Router.coffee +++ b/app/Router.coffee @@ -15,13 +15,16 @@ module.exports = class CocoRouter extends Backbone.Router routes: '': go('HomeView') + 'items': go('game-menu/InventoryView') 'about': go('AboutView') - - 'account/profile(/:userID)': go('account/JobProfileView') + + 'account': go('account/MainAccountView') 'account/settings': go('account/AccountSettingsView') 'account/unsubscribe': go('account/UnsubscribeView') - + 'account/profile': go('user/JobProfileView') # legacy URL, sent in emails + #'account/payment' + 'admin': go('admin/MainAdminView') 'admin/candidates': go('admin/CandidatesView') 'admin/clas': go('admin/CLAsView') @@ -34,7 +37,7 @@ module.exports = class CocoRouter extends Backbone.Router 'cla': go('CLAView') 'community': go('CommunityView') - + 'contribute': go('contribute/MainContributeView') 'contribute/adventurer': go('contribute/AdventurerView') 'contribute/ambassador': go('contribute/AmbassadorView') @@ -46,11 +49,11 @@ module.exports = class CocoRouter extends Backbone.Router 'db/*path': 'routeToServer' 'demo(/*subpath)': go('DemoView') 'docs/components': go('docs/ComponentDocumentationView') - + 'editor': go('editor/MainEditorView') 'editor/achievement': go('editor/achievement/AchievementSearchView') - 'editor/achievement': go('editor/achievement/AchievementEditView') + 'editor/achievement/:articleID': go('editor/achievement/AchievementEditView') 'editor/article': go('editor/article/ArticleSearchView') 'editor/article/preview': go('editor/article/ArticlePreviewView') 'editor/article/:articleID': go('editor/article/ArticleEditView') @@ -58,13 +61,13 @@ module.exports = class CocoRouter extends Backbone.Router 'editor/level/:levelID': go('editor/level/LevelEditView') 'editor/thang': go('editor/thang/ThangTypeSearchView') 'editor/thang/:thangID': go('editor/thang/ThangTypeEditView') - + 'employers': go('EmployersView') 'file/*path': 'routeToServer' 'legal': go('LegalView') - + 'multiplayer': go('MultiplayerView') 'play': go('play/MainPlayView') @@ -76,9 +79,14 @@ module.exports = class CocoRouter extends Backbone.Router 'preview': go('HomeView') 'teachers': go('TeachersView') - + 'test(/*subpath)': go('TestView') + 'user/:slugOrID': go('user/MainUserView') + 'user/:slugOrID/stats': go('user/AchievementsView') + 'user/:slugOrID/profile': go('user/JobProfileView') + #'user/:slugOrID/code': go('user/CodeView') + '*name': 'showNotFoundView' routeToServer: (e) -> diff --git a/app/application.coffee b/app/application.coffee index 4eb829c88..9f23e9f91 100644 --- a/app/application.coffee +++ b/app/application.coffee @@ -1,11 +1,10 @@ FacebookHandler = require 'lib/FacebookHandler' GPlusHandler = require 'lib/GPlusHandler' LinkedInHandler = require 'lib/LinkedInHandler' -locale = require 'locale/locale' +locale = require 'locale/locale' # TODO: don't require all of these? Might be slow. (Haven't checked.) {me} = require 'lib/auth' Tracker = require 'lib/Tracker' CocoView = require 'views/kinds/CocoView' -AchievementNotify = require '../../templates/achievement_notify' marked.setOptions {gfm: true, sanitize: true, smartLists: true, breaks: false} @@ -40,7 +39,6 @@ Application = initialize: -> @facebookHandler = new FacebookHandler() @gplusHandler = new GPlusHandler() $(document).bind 'keydown', preventBackspace - $.notify.addStyle 'achievement', html: $(AchievementNotify()) @linkedinHandler = new LinkedInHandler() preload(COMMON_FILES) $.i18n.init { diff --git a/app/assets/images/pages/about/glen_small.png b/app/assets/images/pages/contribute/archmage/glen_small.png similarity index 100% rename from app/assets/images/pages/about/glen_small.png rename to app/assets/images/pages/contribute/archmage/glen_small.png diff --git a/app/assets/images/pages/editor/level/preset_dungeon_large.jpg b/app/assets/images/pages/editor/level/preset_dungeon_large.jpg new file mode 100644 index 000000000..b39f3558e Binary files /dev/null and b/app/assets/images/pages/editor/level/preset_dungeon_large.jpg differ diff --git a/app/assets/images/pages/editor/level/preset_dungeon_small.jpg b/app/assets/images/pages/editor/level/preset_dungeon_small.jpg new file mode 100644 index 000000000..a8fea9c5c Binary files /dev/null and b/app/assets/images/pages/editor/level/preset_dungeon_small.jpg differ diff --git a/app/assets/images/pages/editor/level/preset_indoor_large.jpg b/app/assets/images/pages/editor/level/preset_indoor_large.jpg new file mode 100644 index 000000000..0ea8b6907 Binary files /dev/null and b/app/assets/images/pages/editor/level/preset_indoor_large.jpg differ diff --git a/app/assets/images/pages/editor/level/preset_indoor_small.jpg b/app/assets/images/pages/editor/level/preset_indoor_small.jpg new file mode 100644 index 000000000..e172b56bd Binary files /dev/null and b/app/assets/images/pages/editor/level/preset_indoor_small.jpg differ diff --git a/app/assets/javascripts/mock-ajax.js b/app/assets/javascripts/mock-ajax.js index 6743da0c8..e4b75ed7b 100644 --- a/app/assets/javascripts/mock-ajax.js +++ b/app/assets/javascripts/mock-ajax.js @@ -263,12 +263,13 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. this.sendResponses = function(responseMap) { var urls = Object.keys(responseMap); + var success = true; for(var i in urls) { var url = urls[i]; var responseBody = responseMap[url]; var responded = false; - var requests = jasmine.Ajax.requests.all(); + var requests = jasmine.Ajax.requests.all().slice(); for(var j in requests) { var request = requests[j]; if(request.url.startsWith(url)) { @@ -282,9 +283,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. urls = []; for(var k in allRequests) urls.push(allRequests[k].url); console.error('could not find response for', url, 'in', urls, allRequests); + success = false; continue; } } + return success; } } diff --git a/app/collections/AchievementCollection.coffee b/app/collections/AchievementCollection.coffee new file mode 100644 index 000000000..d3bbe0343 --- /dev/null +++ b/app/collections/AchievementCollection.coffee @@ -0,0 +1,6 @@ +CocoCollection = require 'collections/CocoCollection' +Achievement = require 'models/Achievement' + +module.exports = class AchievementCollection extends CocoCollection + url: '/db/achievement' + model: Achievement diff --git a/app/collections/EarnedAchievementCollection.coffee b/app/collections/EarnedAchievementCollection.coffee new file mode 100644 index 000000000..82207afeb --- /dev/null +++ b/app/collections/EarnedAchievementCollection.coffee @@ -0,0 +1,9 @@ +CocoCollection = require 'collections/CocoCollection' +EarnedAchievement = require 'models/EarnedAchievement' + +module.exports = class EarnedAchievementCollection extends CocoCollection + model: EarnedAchievement + + initialize: (userID) -> + @url = "/db/user/#{userID}/achievements" + super() diff --git a/app/collections/NewAchievementCollection.coffee b/app/collections/NewAchievementCollection.coffee index 7b33d7d75..b9e4326b5 100644 --- a/app/collections/NewAchievementCollection.coffee +++ b/app/collections/NewAchievementCollection.coffee @@ -1,6 +1,9 @@ CocoCollection = require 'collections/CocoCollection' +Achievement = require 'models/Achievement' class NewAchievementCollection extends CocoCollection + model: Achievement + initialize: (me = require('lib/auth').me) -> @url = "/db/user/#{me.id}/achievements?notified=false" diff --git a/app/collections/RecentlyPlayedCollection.coffee b/app/collections/RecentlyPlayedCollection.coffee new file mode 100644 index 000000000..ff76aaf5b --- /dev/null +++ b/app/collections/RecentlyPlayedCollection.coffee @@ -0,0 +1,9 @@ +CocoCollection = require './CocoCollection' +LevelSession = require 'models/LevelSession' + +module.exports = class RecentlyPlayedCollection extends CocoCollection + model: LevelSession + + constructor: (userID, options) -> + @url = "/db/user/#{userID}/recently_played" + super options diff --git a/app/collections/RelatedAchievementsCollection.coffee b/app/collections/RelatedAchievementsCollection.coffee new file mode 100644 index 000000000..e558d2891 --- /dev/null +++ b/app/collections/RelatedAchievementsCollection.coffee @@ -0,0 +1,10 @@ +CocoCollection = require 'collections/CocoCollection' +Achievement = require 'models/Achievement' + +class RelatedAchievementCollection extends CocoCollection + model: Achievement + + initialize: (relatedID) -> + @url = "/db/achievement?related=#{relatedID}" + +module.exports = RelatedAchievementCollection diff --git a/app/lib/DefaultScripts.coffee b/app/lib/DefaultScripts.coffee new file mode 100644 index 000000000..c1dd80277 --- /dev/null +++ b/app/lib/DefaultScripts.coffee @@ -0,0 +1,25 @@ +module.exports = [ + { + channel: "god:new-world-created" + noteChain: [] + id: "Introduction" + } + { + channel: "world:won" + noteChain: [] + id: "Victory Playback" + scriptPrereqs: ["Introduction"] + } + { + channel: "level-set-playing" + noteChain: [] + scriptPrereqs: ["Victory Playback"] + id: "Victory Playback Started" + } + { + channel: "surface:frame-changed" + noteChain: [] + scriptPrereqs: ["Victory Playback Started"] + id: "Show Victory" + } +] \ No newline at end of file diff --git a/app/lib/LevelBus.coffee b/app/lib/LevelBus.coffee index 845020c8d..7ea0837c1 100644 --- a/app/lib/LevelBus.coffee +++ b/app/lib/LevelBus.coffee @@ -1,6 +1,7 @@ Bus = require './Bus' {me} = require 'lib/auth' LevelSession = require 'models/LevelSession' +utils = require 'lib/utils' module.exports = class LevelBus extends Bus @@ -22,6 +23,7 @@ module.exports = class LevelBus extends Bus 'tome:spell-changed': 'onSpellChanged' 'tome:spell-created': 'onSpellCreated' 'application:idle-changed': 'onIdleChanged' + 'goal-manager:new-goal-states': 'onNewGoalStates' constructor: -> super(arguments...) @@ -192,6 +194,14 @@ module.exports = class LevelBus extends Bus @changedSessionProperties.state = true @saveSession() + onNewGoalStates: ({goalStates})-> + state = @session.get 'state' + unless utils.kindaEqual state.goalStates, goalStates # Only save when goals really change + state.goalStates = goalStates + @session.set 'state', state + @changedSessionProperties.state = true + @saveSession() + onPlayerJoined: (snapshot) => super(arguments...) return unless @onPoint() diff --git a/app/lib/LocalMongo.coffee b/app/lib/LocalMongo.coffee index 2027e1c70..558a58e5d 100644 --- a/app/lib/LocalMongo.coffee +++ b/app/lib/LocalMongo.coffee @@ -24,6 +24,7 @@ doQuerySelector = (value, operatorObj) -> matchesQuery = (target, queryObj) -> return true unless queryObj + throw new Error 'Expected an object to match a query against, instead got null' unless target for prop, query of queryObj if prop[0] == '$' switch prop diff --git a/app/lib/SystemNameLoader.coffee b/app/lib/SystemNameLoader.coffee index c25abb914..c4793d735 100644 --- a/app/lib/SystemNameLoader.coffee +++ b/app/lib/SystemNameLoader.coffee @@ -1,4 +1,4 @@ -CocoClass = require 'lib/CocoClass' +CocoClass = require './CocoClass' namesCache = {} diff --git a/app/lib/deltas.coffee b/app/lib/deltas.coffee index 99df202aa..55743f345 100644 --- a/app/lib/deltas.coffee +++ b/app/lib/deltas.coffee @@ -1,4 +1,4 @@ -SystemNameLoader = require 'lib/SystemNameLoader' +SystemNameLoader = require './SystemNameLoader' ### Good-to-knows: dataPath: an array of keys that walks you up a JSON object that's being patched @@ -12,7 +12,7 @@ module.exports.expandDelta = (delta, left, schema) -> (expandFlattenedDelta(fd, left, schema) for fd in flattenedDeltas) -flattenDelta = (delta, dataPath=null, deltaPath=null) -> +module.exports.flattenDelta = flattenDelta = (delta, dataPath=null, deltaPath=null) -> # takes a single jsondiffpatch delta and returns an array of objects with return [] unless delta dataPath ?= [] @@ -175,3 +175,5 @@ prunePath = (delta, path) -> prunePath delta[path[0]], path.slice(1) unless delta[path[0]] is undefined keys = (k for k in _.keys(delta[path[0]]) when k isnt '_t') delete delta[path[0]] if keys.length is 0 + + diff --git a/app/lib/surface/SpriteBoss.coffee b/app/lib/surface/SpriteBoss.coffee index 6d6714d0c..37ec06c6e 100644 --- a/app/lib/surface/SpriteBoss.coffee +++ b/app/lib/surface/SpriteBoss.coffee @@ -183,9 +183,7 @@ module.exports = class SpriteBoss extends CocoClass updateCache = false itemsJustEquipped = [] for thang in @world.thangs when thang.exists and thang.pos - if thang.equip and not thang.equipped - thang.equip() # Pretty hacky, since initialize may not be called - itemsJustEquipped.push thang + itemsJustEquipped = itemsJustEquipped.concat @equipNewItems thang if sprite = @sprites[thang.id] sprite.setThang thang # make sure Sprite has latest Thang else @@ -206,6 +204,21 @@ module.exports = class SpriteBoss extends CocoClass if @willSelectThang and @sprites[@willSelectThang[0]] @selectThang @willSelectThang... + equipNewItems: (thang) -> + itemsJustEquipped = [] + if thang.equip and not thang.equipped + thang.equip() # Pretty hacky, but needed since initialize may not be called if we're not running Systems. + itemsJustEquipped.push thang + if thang.inventoryIDs + # Even hackier: these items were only created/equipped during simulation, so we reequip here. + for slot, itemID of thang.inventoryIDs + item = @world.getThangByID itemID + unless item.equipped + #console.log thang.id, 'equipping', item, 'in', thang.slot, 'Surface-side' + item.equip() + itemsJustEquipped.push item + return itemsJustEquipped + cache: (update=false) -> return if @cached and not update wallSprites = (sprite for sprite in @spriteArray when sprite.thangType?.get('name').search(/(dungeon|indoor).wall/i) isnt -1) diff --git a/app/lib/utils.coffee b/app/lib/utils.coffee index ae556a431..17167422d 100644 --- a/app/lib/utils.coffee +++ b/app/lib/utils.coffee @@ -25,7 +25,7 @@ module.exports.normalizeFunc = (func_thing, object) -> if _.isString(func_thing) func = object[func_thing] if not func - console.error "Could not find method #{func_thing} in object #{@}" + console.error "Could not find method #{func_thing} in object", object return => null # always return a func, or Mediator will go boom func_thing = func return func_thing @@ -70,6 +70,7 @@ module.exports.i18n = (say, target, language=me.lang(), fallback='en') -> null module.exports.getByPath = (target, path) -> + throw new Error 'Expected an object to match a query against, instead got null' unless target pieces = path.split('.') obj = target for piece in pieces @@ -82,7 +83,7 @@ module.exports.isID = (id) -> _.isString(id) and id.length is 24 and id.match(/[ module.exports.round = _.curry (digits, n) -> n = +n.toFixed(digits) -positify = (func) -> (x) -> if x > 0 then func(x) else 0 +positify = (func) -> (params) -> (x) -> if x > 0 then func(params)(x) else 0 # f(x) = ax + b createLinearFunc = (params) -> @@ -100,3 +101,32 @@ module.exports.functionCreators = linear: positify(createLinearFunc) quadratic: positify(createQuadraticFunc) logarithmic: positify(createLogFunc) + +# Call done with true to satisfy the 'until' goal and stop repeating func +module.exports.keepDoingUntil = (func, wait=100, totalWait=5000) -> + waitSoFar = 0 + (done = (success) -> + if (waitSoFar += wait) <= totalWait and not success + _.delay (-> func done), wait) false + +module.exports.grayscale = (imageData) -> + d = imageData.data + for i in [0..d.length] by 4 + r = d[i] + g = d[i+1] + b = d[i+2] + v = 0.2126*r + 0.7152*g + 0.0722*b + d[i] = d[i+1] = d[i+2] = v + imageData + +# Deep compares l with r, with the exception that undefined values are considered equal to missing values +# Very practical for comparing Mongoose documents where undefined is not allowed, instead fields get deleted +module.exports.kindaEqual = compare = (l, r) -> + if _.isObject(l) and _.isObject(r) + for key in _.union Object.keys(l), Object.keys(r) + return false unless compare l[key], r[key] + return true + else if l is r + return true + else + return false diff --git a/app/lib/world/thang.coffee b/app/lib/world/thang.coffee index 63d544b1e..64eb698c6 100644 --- a/app/lib/world/thang.coffee +++ b/app/lib/world/thang.coffee @@ -62,7 +62,7 @@ module.exports = class Thang componentClass = @world.classMap[componentClass] else @world?.classMap[componentClass.className] ?= componentClass - c = new componentClass componentConfig + c = new componentClass componentConfig ? {} c.attach @ # [prop, type]s of properties which have values tracked across WorldFrames. Also call keepTrackedProperty some non-expensive time when you change it or it will be skipped. diff --git a/app/lib/world/world.coffee b/app/lib/world/world.coffee index ce442e263..de540b991 100644 --- a/app/lib/world/world.coffee +++ b/app/lib/world/world.coffee @@ -194,7 +194,7 @@ module.exports = class World try thang.addComponents components... catch e - console.error 'couldn\'t load components for', thangConfig.thangType, thangConfig.id, 'because', e, e.stack + console.error 'couldn\'t load components for', thangTypeOriginal, thangConfig.id, 'because', e.toString(), e.stack thang addThang: (thang) -> diff --git a/app/locale/ar.coffee b/app/locale/ar.coffee index 0e0465257..36859535c 100644 --- a/app/locale/ar.coffee +++ b/app/locale/ar.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi # blog: "Blog" # forum: "Forum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" # admin: "Admin" # home: "Home" # contribute: "Contribute" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi # new_password: "New Password" # new_password_verify: "Verify" # email_subscriptions: "Email Subscriptions" +# email_subscriptions_none: "No Email Subscriptions." # email_announcements: "Announcements" # email_announcements_description: "Get emails on the latest news and developments at CodeCombat." # email_notifications: "Notifications" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." # contributor_emails: "Contributor Class Emails" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi # general: # and: "and" # name: "Name" +# date: "Date" # body: "Body" # version: "Version" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/bg.coffee b/app/locale/bg.coffee index b8905d1c4..917bbc3d1 100644 --- a/app/locale/bg.coffee +++ b/app/locale/bg.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "български език", englishDescri blog: "Блог" forum: "Форум" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" # admin: "Admin" # home: "Home" # contribute: "Contribute" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "български език", englishDescri # new_password: "New Password" # new_password_verify: "Verify" # email_subscriptions: "Email Subscriptions" +# email_subscriptions_none: "No Email Subscriptions." # email_announcements: "Announcements" # email_announcements_description: "Get emails on the latest news and developments at CodeCombat." # email_notifications: "Notifications" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." # contributor_emails: "Contributor Class Emails" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "български език", englishDescri # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "български език", englishDescri # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" article: edit_btn_preview: "Преглед" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "български език", englishDescri general: and: "и" name: "Име" +# date: "Date" # body: "Body" version: "Версия" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "български език", englishDescri # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "български език", englishDescri # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "български език", englishDescri # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/ca.coffee b/app/locale/ca.coffee index 9e5dad953..3d15bf783 100644 --- a/app/locale/ca.coffee +++ b/app/locale/ca.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr blog: "Blog" forum: "Fòrum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Admin" home: "Inici" contribute: "Col·laborar" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # new_password: "New Password" # new_password_verify: "Verify" # email_subscriptions: "Email Subscriptions" +# email_subscriptions_none: "No Email Subscriptions." # email_announcements: "Announcements" # email_announcements_description: "Get emails on the latest news and developments at CodeCombat." # email_notifications: "Notifications" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." # contributor_emails: "Contributor Class Emails" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # general: # and: "and" # name: "Name" +# date: "Date" # body: "Body" # version: "Version" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/cs.coffee b/app/locale/cs.coffee index d7deb8a67..ce9b5eecd 100644 --- a/app/locale/cs.coffee +++ b/app/locale/cs.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr blog: "Blog" forum: "Fórum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Admin" home: "Domů" contribute: "Přispívat" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr new_password: "Nové heslo" new_password_verify: "Potvrdit" email_subscriptions: "Doručovat emailem" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Oznámení" email_announcements_description: "Zasílat emaily o posledních novinkách a o postupu ve vývoji CodeCombat." # email_notifications: "Notifications" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." contributor_emails: "Emaily pro přispívatele" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" editor: main_title: "Editory CodeCombatu" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" article: edit_btn_preview: "Náhled" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr general: and: "a" name: "Jméno" +# date: "Date" body: "Tělo" version: "Verze" commit_msg: "Popisek ukládání" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr nick_description: "Programátorský kouzelník, excentrický motivační mág i experimentátor. Nick by mohl dělat de-facto cokoliv, ale zvolil si vytvořit CodeCombat." jeremy_description: "Mistr zákaznické podpory, tester použitelnosti a organizátor komunity. Je velmi pravděpodobné, že jste si spolu již psali." michael_description: "Programátor, systémový administrátor a král podsvětí technického zázemí. Michael udržuje naše servery online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." legal: page_title: "Licence" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr introduction_desc_github_url: "CodeCombat je kompletně open source" introduction_desc_suf: "a snažíme se jak jen to jde, abychom vám umožnili se do tohoto projektu zapojit." introduction_desc_ending: "Doufáme, že se k nám přidáte!" - introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy a Glen" + introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy a Matt" alert_account_message_intro: "Vítejte!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/da.coffee b/app/locale/da.coffee index 249d6a383..1f85341e4 100644 --- a/app/locale/da.coffee +++ b/app/locale/da.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans blog: "Blog" forum: "Forum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Admin" home: "Hjem" contribute: "Bidrag" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans new_password: "Nyt Password" new_password_verify: "Bekræft" email_subscriptions: "Emailtilmeldinger" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Nyheder" email_announcements_description: "Få emails om de seneste nyheder og udvikling på CodeCombat." email_notifications: "Notifikationer" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." contributor_emails: "Bidragsklasse-emails" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans level_search_title: "Søg Baner Her" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" article: edit_btn_preview: "Forhåndsvisning" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans general: and: "og" name: "navn" +# date: "Date" body: "krop" version: "version" commit_msg: "ændringsnotat" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." introduction_desc_ending: "Vi håber du vil deltage i vores fest!" - introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy, ogGlen" + introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy, ogMatt" alert_account_message_intro: "Hej med dig!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/de-AT.coffee b/app/locale/de-AT.coffee index fc8e2850d..3c18983f6 100644 --- a/app/locale/de-AT.coffee +++ b/app/locale/de-AT.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription: # blog: "Blog" # forum: "Forum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" # admin: "Admin" # home: "Home" # contribute: "Contribute" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription: # new_password: "New Password" # new_password_verify: "Verify" # email_subscriptions: "Email Subscriptions" +# email_subscriptions_none: "No Email Subscriptions." # email_announcements: "Announcements" # email_announcements_description: "Get emails on the latest news and developments at CodeCombat." # email_notifications: "Notifications" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." # contributor_emails: "Contributor Class Emails" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription: # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription: # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription: # general: # and: "and" # name: "Name" +# date: "Date" # body: "Body" # version: "Version" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription: # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription: # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription: # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/de-CH.coffee b/app/locale/de-CH.coffee index 92e073458..e81164a48 100644 --- a/app/locale/de-CH.coffee +++ b/app/locale/de-CH.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge blog: "Blog" forum: "Forum" account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Admin" home: "Home" contribute: "Mitmache" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge new_password: "Neus Passwort" new_password_verify: "Bestätige" email_subscriptions: "E-Mail Abos" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Akündigunge" email_announcements_description: "Bechum Mails mit Neuigkeite und de neuste Entwicklige bi CodeCombat." email_notifications: "Benachrichtigunge" email_notifications_summary: "Istellige für personalisierti, automatischi E-Mail Notifikatione im Zemehang mit dine CodeCombat Aktivitäte" email_any_notes: "Alli Notifikatione" email_any_notes_description: "Deaktiviere zum kei Aktivitäts-Notifikatione meh per E-Mail becho." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." # contributor_emails: "Contributor Class Emails" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge # clas: "CLAs" community: - level_editor: "Level Editor" main_title: "CodeCombat Community" - facebook: "Facebook" - twitter: "Twitter" - gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge # general: # and: "and" # name: "Name" +# date: "Date" # body: "Body" # version: "Version" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge nick_description: "Programmier-Zauberer, exzentrische Motivations-Magier und Chopfüber-Experimentierer. De Nick chönti alles mache und het sich entschiede zum CodeCombat baue." jeremy_description: "Kundesupport-Magier, Usability Tester und Community-Organisator; du hesch worschinli scho mitem Jeremy gredet." michael_description: "Programmierer, Systemadmin und es technisches Wunderchind ohni Studium. Michael isch die Person wo üsi Server am Laufe bhaltet." - glen_description: "Programmierer und passionierte Gameentwickler mit de Motivation, die Welt zumene bessere Ort zmache, indem mer Sache entwickled wo e Rolle spieled. S Wort unmöglich findet mer nid i sim Wortschatz. Neui Fähigkeite erlerne isch sini Freud!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." legal: page_title: "Rechtlichs" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/de-DE.coffee b/app/locale/de-DE.coffee index 33d3d34df..ee180693e 100644 --- a/app/locale/de-DE.coffee +++ b/app/locale/de-DE.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: blog: "Blog" forum: "Forum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Administration" home: "Home" contribute: "Helfen" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: new_password: "Neues Passwort" new_password_verify: "Passwort verifizieren" email_subscriptions: "Email Abonnements" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Ankündigungen" email_announcements_description: "Erhalte regelmäßig Ankündigungen zu deinem Account." email_notifications: "Benachrichtigungen" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" email_recruit_notes: "Job-Angebote" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." contributor_emails: "Unterstützer Email" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: # clas: "CLAs" community: - level_editor: "Level Editor" main_title: "CodeCombat Community" - facebook: "Facebook" - twitter: "Twitter" - gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" editor: main_title: "CodeCombat Editoren" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: level_search_title: "Durchsuche Levels hier" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" article: edit_btn_preview: "Vorschau" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: general: and: "und" name: "Name" +# date: "Date" body: "Inhalt" version: "Version" commit_msg: "Commit Nachricht" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: nick_description: "Programmierzauberer, exzentrischer Motivationskünstler und Auf-den-Kopf-stell-Experimentierer. Nick könnte alles mögliche tun und entschied CodeCombat zu bauen." jeremy_description: "Kundendienstmagier, Usability Tester und Community-Organisator. Wahrscheinlich hast du schon mit Jeremy gesprochen." michael_description: "Programmierer, Systemadministrator und studentisch technisches Wunderkind, Michael hält unsere Server am Laufen." - glen_description: "Programmier und leidenschaftlicher Spieleentwickler mit der Motivation die Welt, durch das Entwickeln von Sachen die zählen, zu einem besseren Platz zu machen. Das Wort 'unmöglich' kann nicht in seinem Wortschatz gefunden werden. Neue Fähigkeiten zu lernen ist seine Leidenschaft!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." legal: page_title: "Rechtliches" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription: # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/de.coffee b/app/locale/de.coffee index 8a4307ee9..ffeef03df 100644 --- a/app/locale/de.coffee +++ b/app/locale/de.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra blog: "Blog" forum: "Forum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Administration" home: "Home" contribute: "Helfen" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra new_password: "Neues Passwort" new_password_verify: "Passwort verifizieren" email_subscriptions: "Email Abonnements" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Ankündigungen" email_announcements_description: "Erhalte regelmäßig Ankündigungen zu deinem Account." email_notifications: "Benachrichtigungen" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" email_recruit_notes: "Job-Angebote" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." contributor_emails: "Unterstützer Email" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra # clas: "CLAs" community: - level_editor: "Level Editor" main_title: "CodeCombat Community" - facebook: "Facebook" - twitter: "Twitter" - gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" editor: main_title: "CodeCombat Editoren" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra level_search_title: "Durchsuche Levels hier" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" article: edit_btn_preview: "Vorschau" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra general: and: "und" name: "Name" +# date: "Date" body: "Inhalt" version: "Version" commit_msg: "Commit Nachricht" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra nick_description: "Programmierzauberer, exzentrischer Motivationskünstler und Auf-den-Kopf-stell-Experimentierer. Nick könnte alles mögliche tun und entschied CodeCombat zu bauen." jeremy_description: "Kundendienstmagier, Usability Tester und Community-Organisator. Wahrscheinlich hast du schon mit Jeremy gesprochen." michael_description: "Programmierer, Systemadministrator und studentisch technisches Wunderkind, Michael hält unsere Server am Laufen." - glen_description: "Programmier und leidenschaftlicher Spieleentwickler mit der Motivation die Welt, durch das Entwickeln von Sachen die zählen, zu einem besseren Platz zu machen. Das Wort 'unmöglich' kann nicht in seinem Wortschatz gefunden werden. Neue Fähigkeiten zu lernen ist seine Leidenschaft!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." legal: page_title: "Rechtliches" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/el.coffee b/app/locale/el.coffee index 7f6c8119e..3d27b4456 100644 --- a/app/locale/el.coffee +++ b/app/locale/el.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre blog: "Μπλόγκ" forum: "Φόρουμ" account: "Λογαριασμός" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Διαχειριστής" home: "Αρχική" contribute: "Συμβάλλω" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre new_password: "Καινούργιος Κωδικός" new_password_verify: " Επαλήθευση Κωδικού" email_subscriptions: "Συνδρομές Email" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Ανακοινώσεις" email_announcements_description: "Λάβετε emails για τα τελευταία νέα και τις εξελίξεις του CodeCombat." email_notifications: "Ειδοποιήσεις" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." contributor_emails: "Contributor Class Emails" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre general: and: "και" name: "Όνομα" +# date: "Date" # body: "Body" version: "Έκδοση" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/en-AU.coffee b/app/locale/en-AU.coffee index 44c898d37..338488db7 100644 --- a/app/locale/en-AU.coffee +++ b/app/locale/en-AU.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English # blog: "Blog" # forum: "Forum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" # admin: "Admin" # home: "Home" # contribute: "Contribute" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English # new_password: "New Password" # new_password_verify: "Verify" # email_subscriptions: "Email Subscriptions" +# email_subscriptions_none: "No Email Subscriptions." # email_announcements: "Announcements" # email_announcements_description: "Get emails on the latest news and developments at CodeCombat." # email_notifications: "Notifications" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." # contributor_emails: "Contributor Class Emails" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English # general: # and: "and" # name: "Name" +# date: "Date" # body: "Body" # version: "Version" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/en-GB.coffee b/app/locale/en-GB.coffee index b1ead3374..c3c1d2933 100644 --- a/app/locale/en-GB.coffee +++ b/app/locale/en-GB.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English # blog: "Blog" # forum: "Forum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" # admin: "Admin" # home: "Home" # contribute: "Contribute" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English # new_password: "New Password" # new_password_verify: "Verify" # email_subscriptions: "Email Subscriptions" +# email_subscriptions_none: "No Email Subscriptions." # email_announcements: "Announcements" # email_announcements_description: "Get emails on the latest news and developments at CodeCombat." # email_notifications: "Notifications" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." # contributor_emails: "Contributor Class Emails" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English # general: # and: "and" # name: "Name" +# date: "Date" # body: "Body" # version: "Version" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." jeremy_description: "Customer support mage, usability tester, and community organiser; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." archmage_summary: "Interested in working on game graphics, user interface design, database and server organisation, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/en-US.coffee b/app/locale/en-US.coffee index 7f59ed334..15c436e31 100644 --- a/app/locale/en-US.coffee +++ b/app/locale/en-US.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English # blog: "Blog" # forum: "Forum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" # admin: "Admin" # home: "Home" # contribute: "Contribute" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English # new_password: "New Password" # new_password_verify: "Verify" # email_subscriptions: "Email Subscriptions" +# email_subscriptions_none: "No Email Subscriptions." # email_announcements: "Announcements" # email_announcements_description: "Get emails on the latest news and developments at CodeCombat." # email_notifications: "Notifications" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." # contributor_emails: "Contributor Class Emails" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English # general: # and: "and" # name: "Name" +# date: "Date" # body: "Body" # version: "Version" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/en.coffee b/app/locale/en.coffee index 0bbbbcabb..8f34232a1 100644 --- a/app/locale/en.coffee +++ b/app/locale/en.coffee @@ -49,6 +49,9 @@ blog: "Blog" forum: "Forum" account: "Account" + profile: "Profile" + stats: "Stats" + code: "Code" admin: "Admin" home: "Home" contribute: "Contribute" @@ -176,12 +179,14 @@ new_password: "New Password" new_password_verify: "Verify" email_subscriptions: "Email Subscriptions" + email_subscriptions_none: "No Email Subscriptions." email_announcements: "Announcements" email_announcements_description: "Get emails on the latest news and developments at CodeCombat." email_notifications: "Notifications" email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." email_any_notes: "Any Notifications" email_any_notes_description: "Disable to stop all activity notification emails." + email_news: "News" email_recruit_notes: "Job Opportunities" email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." contributor_emails: "Contributor Class Emails" @@ -519,11 +524,16 @@ clas: "CLAs" community: - level_editor: "Level Editor" main_title: "CodeCombat Community" - facebook: "Facebook" - twitter: "Twitter" - gplus: "Google+" + 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!" + thang_editor_prefix: "We call units within the game 'thangs'. Use the" + thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." + article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" + article_editor_suffix: "and help CodeCombat players get the most out of their playtime." + find_us: "Find us on these sites" + contribute_to_the_project: "Contribute to the project" editor: main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ level_search_title: "Search Levels Here" achievement_search_title: "Search Achievements" read_only_warning2: "Note: you can't save any edits here, because you're not logged in." + no_achievements: "No achievements have been added for this level yet." + achievement_query_misc: "Key achievement off of miscellanea" + achievement_query_goals: "Key achievement off of level goals" + level_completion: "Level Completion" article: edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ general: and: "and" name: "Name" + date: "Date" body: "Body" version: "Version" commit_msg: "Commit Message" @@ -647,7 +662,7 @@ nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." - glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" + matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." legal: page_title: "Legal" @@ -718,7 +733,7 @@ introduction_desc_github_url: "CodeCombat is totally open source" introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." introduction_desc_ending: "We hope you'll join our party!" - introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" + introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" alert_account_message_intro: "Hey there!" alert_account_message: "To subscribe for class emails, you'll need to be logged in first." archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -929,6 +944,7 @@ candidate_sessions: "Candidate Sessions" user_remark: "User Remark" versions: "Versions" + items: "Items" delta: added: "Added" @@ -938,3 +954,38 @@ text_diff: "Text Diff" merge_conflict_with: "MERGE CONFLICT WITH" no_changes: "No Changes" + + user: + stats: "Stats" + singleplayer_title: "Singleplayer Levels" + multiplayer_title: "Multiplayer Levels" + achievements_title: "Achievements" + last_played: "Last Played" + status: "Status" + status_completed: "Completed" + status_unfinished: "Unfinished" + no_singleplayer: "No Singleplayer games played yet." + no_multiplayer: "No Multiplayer games played yet." + no_achievements: "No Achievements earned yet." + favorite_prefix: "Favorite language is " + favorite_postfix: "." + + achievements: + last_earned: "Last Earned" + amount_achieved: "Amount" + achievement: "Achievement" + category_contributor: "Contributor" + category_miscellaneous: "Miscellaneous" + category_levels: "Levels" + category_undefined: "Uncategorized" + current_xp_prefix: "" + current_xp_postfix: " in total" + new_xp_prefix: "" + new_xp_postfix: " earned" + left_xp_prefix: "" + left_xp_infix: " until level " + left_xp_postfix: "" + + account: + recently_played: "Recently Played" + no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/es-419.coffee b/app/locale/es-419.coffee index 3b1134683..8e839ca04 100644 --- a/app/locale/es-419.coffee +++ b/app/locale/es-419.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip blog: "Blog" forum: "Foro" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Admin" home: "Inicio" contribute: "Contribuir" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip new_password: "Nueva Contraseña" new_password_verify: "Verificar" email_subscriptions: "Suscripciones de Email" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Noticias" email_announcements_description: "Recibe correos electrónicos con las últimas noticias y desarrollos de CodeCombat." email_notifications: "Notificaciones" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." contributor_emails: "Emails Clase Contribuyente" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" article: edit_btn_preview: "Vista previa" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip general: and: "y" name: "Nombre" +# date: "Date" body: "Cuerpo" version: "Versión" commit_msg: "Enviar mensaje" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/es-ES.coffee b/app/locale/es-ES.coffee index 52690ab9e..b034c2d49 100644 --- a/app/locale/es-ES.coffee +++ b/app/locale/es-ES.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis blog: "Blog" forum: "Foro" account: "Cuenta" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Admin" home: "Inicio" contribute: "Colaborar" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis new_password: "Nueva contraseña" new_password_verify: "Verificar" email_subscriptions: "Suscripciones de correo electrónico" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Noticias" email_announcements_description: "Recibe correos electrónicos con las últimas noticias y desarrollos de CodeCombat." email_notifications: "Notificationes" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" email_recruit_notes_description: "Si tu juegas realmente bien, puede que contactemos contigo para que consigas un trabajo (mejor)." contributor_emails: "Correos para colaboradores" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis clas: "CLAs" community: - level_editor: "Editor de niveles" main_title: "Comunidad de CodeCombat" - facebook: "Facebook" - twitter: "Twitter" - gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" editor: main_title: "Editores de CodeCombat" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis level_search_title: "Buscar niveles aquí" achievement_search_title: "Buscar Logros" read_only_warning2: "Nota: no puedes guardar nada de lo que edites aqui porque no has iniciado sesión." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" article: edit_btn_preview: "Vista preliminar" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis general: and: "y" name: "Nombre" +# date: "Date" body: "Cuerpo" version: "Versión" commit_msg: "Mensaje de Asignación o Commit" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis nick_description: "Mago de la programación, hechicero excéntrico de la motivación y experimentador del revés. Nick pudo haber hecho cualquier cosa y eligió desarrollar CodeCombat." jeremy_description: "Mago de la atención al cliente, tester de usabilidad y organizador de la comunidad; es probable que ya hayas hablado con Jeremy." michael_description: "Programador, administrador de sistemas y prodigio técnico, Michael es el encargado de mantener nuestros servidores en línea." - glen_description: "Programador y apasionado desarrollador de juegos, con la motivación de hacer este mundo un sitio mejor, desarrollando cosas que importan. La palabra imposible no existe en su diccionario. ¡Aprender nuevas habilidades es su hobby!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." legal: page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis introduction_desc_github_url: "CodeCombat es totalmente de código abierto" introduction_desc_suf: ", y nuestro objetivo es ofrecer tantas maneras como sea posible para que tomes parte y hagas de este proyecto algo tan tuyo como nuestro." introduction_desc_ending: "¡Esperamos que te unas a nuestro equipo!" - introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy y Glen" + introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy y Matt" alert_account_message_intro: "¡Hola!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." archmage_summary: "¿Interesado en trabajar en gráficos para juegos, el diseño de la interfaz de usuario, bases de datos y la organización de servidores, redes multijugador, físicas, sonido o el funcionamiento del motor del juego? ¿Quieres ayudar a construir un juego para ayudar a otras personas a aprender aquello en lo que eres bueno? Tenemos mucho que hacer y si eres un programador experimentado y quieres desarrollar para CodeCombat, esta clase es para tí. Nos encantaría recibir tu ayuda para construir el mejor juego de programación que se haya hecho." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" no_changes: "Sin Cambios" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/es.coffee b/app/locale/es.coffee index dbab3e948..48ebcf7bd 100644 --- a/app/locale/es.coffee +++ b/app/locale/es.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t blog: "Blog" forum: "Foro" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Admin" home: "Inicio" contribute: "Contribuir" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t new_password: "Nueva Contraseña" new_password_verify: "Verificar" email_subscriptions: "Suscripciones de Email" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Noticias" email_announcements_description: "Recibe correos electrónicos con las últimas noticias y desarrollos de CodeCombat." email_notifications: "Notificación" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." contributor_emails: "Correos Para Colaboradores" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" article: edit_btn_preview: "Previsualizar" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t general: and: "y" name: "Nombre" +# date: "Date" body: "Cuerpo" version: "Versión" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/fa.coffee b/app/locale/fa.coffee index 0863c9fdd..70fd8bf50 100644 --- a/app/locale/fa.coffee +++ b/app/locale/fa.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian", blog: "بلاگ" forum: "انجمن" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "مدیر" home: "خانه" contribute: "همکاری" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian", # new_password: "New Password" # new_password_verify: "Verify" # email_subscriptions: "Email Subscriptions" +# email_subscriptions_none: "No Email Subscriptions." # email_announcements: "Announcements" # email_announcements_description: "Get emails on the latest news and developments at CodeCombat." # email_notifications: "Notifications" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." # contributor_emails: "Contributor Class Emails" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian", # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian", # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian", general: # and: "and" name: "نام" +# date: "Date" # body: "Body" # version: "Version" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian", # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian", # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian", # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/fi.coffee b/app/locale/fi.coffee index 65537d51b..778c6a431 100644 --- a/app/locale/fi.coffee +++ b/app/locale/fi.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran # blog: "Blog" # forum: "Forum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" # admin: "Admin" # home: "Home" # contribute: "Contribute" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran # new_password: "New Password" # new_password_verify: "Verify" # email_subscriptions: "Email Subscriptions" +# email_subscriptions_none: "No Email Subscriptions." # email_announcements: "Announcements" # email_announcements_description: "Get emails on the latest news and developments at CodeCombat." # email_notifications: "Notifications" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." # contributor_emails: "Contributor Class Emails" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran # general: # and: "and" # name: "Name" +# date: "Date" # body: "Body" # version: "Version" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/fr.coffee b/app/locale/fr.coffee index 2d787e83e..22f06f8e4 100644 --- a/app/locale/fr.coffee +++ b/app/locale/fr.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "français", englishDescription: "French", t blog: "Blog" forum: "Forum" account: "Compte" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Admin" home: "Accueil" contribute: "Contribuer" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "français", englishDescription: "French", t new_password: "Nouveau mot de passe" new_password_verify: "Vérifier" email_subscriptions: "Abonnements" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Annonces" email_announcements_description: "Recevoir des mails sur les dernières actualités et sur le développement de CodeCombat." email_notifications: "Notifications" email_notifications_summary: "Commandes pour personaliser les notifications automatiques d'email liées à votre activité sur CodeCombat." email_any_notes: "Toutes Notifications" email_any_notes_description: "Désactivez pour ne plus recevoir de notifications par e-mail." +# email_news: "News" email_recruit_notes: "Offres d'emploi" email_recruit_notes_description: "Si vous jouez vraiment bien, nous pouvons vous contacter pour vous proposer un (meilleur) emploi." contributor_emails: "Emails des contributeurs" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "français", englishDescription: "French", t clas: "CLAs" community: - level_editor: "Editeur de niveau" main_title: "Communauté CodeCombat" - facebook: "Facebook" - twitter: "Twitter" - gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" editor: main_title: "Éditeurs CodeCombat" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "français", englishDescription: "French", t level_search_title: "Rechercher dans les niveaux" # achievement_search_title: "Search Achievements" read_only_warning2: "Note: vous ne pouvez sauvegarder aucune édition, car vous n'êtes pas identifié." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" article: edit_btn_preview: "Prévisualiser" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t general: and: "et" name: "Nom" +# date: "Date" body: "Corps" version: "Version" commit_msg: "Message de mise à jour" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t nick_description: "Assistant programmeur, mage à la motivation excentrique, et bidouilleur de l'extrême. Nick peut faire n'importe quoi mais il a choisi CodeCombat." jeremy_description: "Mage de l'assistance client, testeur de maniabilité, et community manager; vous avez probablement déjà parlé avec Jeremy." michael_description: "Programmeur, administrateur réseau, et l'enfant prodige du premier cycle, Michael est la personne qui maintient nos serveurs en ligne." - glen_description: "Programmeur et développeur de jeux passioné, avec la motivation pour faire de ce monde un meilleur endroit, en développant des choses qui comptent. Le mot impossible est introuvable dans son dictionnaire. Apprendre de nouveaux talents est sa joie !" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." legal: page_title: "Légal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t introduction_desc_github_url: "CodeCombat est totalement open source" introduction_desc_suf: ", et nous avons pour objectif de fournir autant de manières possibles pour que vous participiez et fassiez de ce projet autant le votre que le notre." introduction_desc_ending: "Nous espérons que vous allez joindre notre aventure!" - introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy et Glen" + introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy et Matt" alert_account_message_intro: "Et tiens!" alert_account_message: "Pour souscrire aux e-mails, vous devez être connecté" # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "français", englishDescription: "French", t text_diff: "Différence de texte" merge_conflict_with: "Fusionner les conflits avec" no_changes: "Aucuns Changements" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/he.coffee b/app/locale/he.coffee index 324afd38a..458faf794 100644 --- a/app/locale/he.coffee +++ b/app/locale/he.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew", blog: "בלוג" forum: "פורום" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "אדמין" home: "בית" contribute: "תרום" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew", new_password: "סיסמה חדשה" new_password_verify: "חזור על הסיסמה שנית" email_subscriptions: "הרשמויות אימייל" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "הודעות" email_announcements_description: "קבל את החדשות ואת הפיתוחים הכי חדישים במשחק באימייל." email_notifications: "עדכונים" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." contributor_emails: "אימיילים של כיתות תורמים" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew", # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew", # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew", # general: # and: "and" # name: "Name" +# date: "Date" # body: "Body" # version: "Version" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew", # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew", # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew", # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/hi.coffee b/app/locale/hi.coffee index 5ab1ab3de..f85054a33 100644 --- a/app/locale/hi.coffee +++ b/app/locale/hi.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe # blog: "Blog" # forum: "Forum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" # admin: "Admin" # home: "Home" # contribute: "Contribute" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe # new_password: "New Password" # new_password_verify: "Verify" # email_subscriptions: "Email Subscriptions" +# email_subscriptions_none: "No Email Subscriptions." # email_announcements: "Announcements" # email_announcements_description: "Get emails on the latest news and developments at CodeCombat." # email_notifications: "Notifications" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." # contributor_emails: "Contributor Class Emails" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe # general: # and: "and" # name: "Name" +# date: "Date" # body: "Body" # version: "Version" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/hu.coffee b/app/locale/hu.coffee index 6e2c2e604..db8543482 100644 --- a/app/locale/hu.coffee +++ b/app/locale/hu.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t blog: "Blog" forum: "Fórum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Admin" home: "Kezdőlap" contribute: "Segítségnyújtás" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t new_password: "Új jelszó" new_password_verify: "Új jelszó megismétlése" email_subscriptions: "Hírlevél feliratkozások" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Bejelentések" email_announcements_description: "Szeretnél levelet kapni a legújabb fejlesztéseinkről?" email_notifications: "Értesítések" email_notifications_summary: "CodeCombat tevékenységedre vonatkozó személyre szóló, automatikus értesítések beállításai." email_any_notes: "Bármely megjegyzés" email_any_notes_description: "Minden tevékenységgel kapcsolatos e-mail értesítés letiltása." +# email_news: "News" email_recruit_notes: "Álláslehetőségek" email_recruit_notes_description: "Ha igazán jól játszol lehet, hogy felveszzük veled a kapcsolatot és megbeszéljük, hogy szerezzünk-e neked egy (jobb) állást." contributor_emails: "Hozzájárulóknak szóló levelek" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t # general: # and: "and" # name: "Name" +# date: "Date" # body: "Body" # version: "Version" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/id.coffee b/app/locale/id.coffee index b35f4468b..7e9288a4f 100644 --- a/app/locale/id.coffee +++ b/app/locale/id.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind # blog: "Blog" # forum: "Forum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" # admin: "Admin" # home: "Home" # contribute: "Contribute" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind # new_password: "New Password" # new_password_verify: "Verify" # email_subscriptions: "Email Subscriptions" +# email_subscriptions_none: "No Email Subscriptions." # email_announcements: "Announcements" # email_announcements_description: "Get emails on the latest news and developments at CodeCombat." # email_notifications: "Notifications" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." # contributor_emails: "Contributor Class Emails" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind # general: # and: "and" # name: "Name" +# date: "Date" # body: "Body" # version: "Version" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/it.coffee b/app/locale/it.coffee index 0ac1d1a02..49b2634a9 100644 --- a/app/locale/it.coffee +++ b/app/locale/it.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t blog: "Blog" forum: "Forum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Amministratore" home: "Pagina iniziale" contribute: "Contribuisci" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t new_password: "Nuova password" new_password_verify: "Verifica" email_subscriptions: "Sottoscrizioni email" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Annunci email" email_announcements_description: "Ricevi email con le ultime novità e sviluppi di CodeCombat." email_notifications: "Notifiche email" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." contributor_emails: "Email dei collaboratori" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" editor: main_title: "Editor di CodeCombat" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" article: edit_btn_preview: "Anteprima" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t general: and: "e" name: "Nome" +# date: "Date" body: "Testo" version: "Versione" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." legal: page_title: "Questioni legali" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/ja.coffee b/app/locale/ja.coffee index c9b95d887..3770dbf4b 100644 --- a/app/locale/ja.coffee +++ b/app/locale/ja.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese", blog: "ブログ" forum: "掲示板" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "管理" home: "ホーム" contribute: "貢献" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese", new_password: "新パスワード" new_password_verify: "新パスワードを再入力" email_subscriptions: "ニュースレターの購読" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "お知らせ" email_announcements_description: "CodeCombatの最新のニュースや進展をメールで受け取る" email_notifications: "通知" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." contributor_emails: "開発を手伝ってくれる人向けのメール" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese", clas: "CLA" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" editor: main_title: "CodeCombatエディター" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese", # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese", # general: # and: "and" # name: "Name" +# date: "Date" # body: "Body" # version: "Version" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese", # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese", # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese", # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/ko.coffee b/app/locale/ko.coffee index b1adfef5b..3487a8a4a 100644 --- a/app/locale/ko.coffee +++ b/app/locale/ko.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t blog: "블로그" forum: "포럼" account: "계정" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "관리자" home: "홈" contribute: "참여하기" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t new_password: "새 비밀번호" new_password_verify: "확인(다시한번 입력해주세요)" email_subscriptions: "이메일 구독" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "공지사항" email_announcements_description: "코드 컴뱃의 개발 및 진행 상황을 이메일로 구독하세요" email_notifications: "알람" email_notifications_summary: "당신의 코드 컴뱃 활동과 관련된 자동 알림 메일을 설정할 수 있습니다." email_any_notes: "모든 알림 받기" email_any_notes_description: "모든 알림 메일 받지 않기" +# email_news: "News" email_recruit_notes: "구인 정보" email_recruit_notes_description: "정말 실력이 좋으시다고 판단되면, 보다 좋은 구직 정보와 관련하여 연락드릴 수도 있습니다." contributor_emails: "조력자들 이메일" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t clas: "컨트리뷰터 라이센스 약관" community: - level_editor: "레벨 에디터" main_title: "코드 컴뱃 커뮤니티" - facebook: "페이스북" - twitter: "트위터" - gplus: "구글 플러스" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" editor: main_title: "코드 컴뱃 에디터들" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t level_search_title: "레벨들은 여기에서 찾으세요" achievement_search_title: "업적 검색" read_only_warning2: "주의: 로그인하지 않으셨기 때문에 내용을 저장할 수 없습니다." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" article: edit_btn_preview: "미리보기" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t general: and: "그리고" name: "이름" +# date: "Date" body: "구성" version: "버전" commit_msg: "커밋 메세지" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t nick_description: "프로그래밍 마법사, 별난 자극의 마술사, 거꾸로 생각하는것을 좋아하는 실험가. Nick은 뭐든지 할수있는 남자입니다. 그 뭐든지 중에 코드 컴뱃을 선택했죠. " jeremy_description: "고객 지원 마법사, 사용성 테스터, 커뮤니티 오거나이저; 당신은 아마 이미 Jeremy랑 이야기 했을거에요." michael_description: "프로그래머, 시스템 관리자, 기술 신동(대학생이래요),Michael 은 우리 서버를 계속 무결점상태로 유지시켜주는 사람입니다." - glen_description: "프로그래머이자 열정적인 게임 개발자. 의미있는 것들을 개발함으로써 세상을 보다 더 나은 곳으로 변화시키고자 하는 개발자입니다. 그의 사전에 불가능이란 없습니다. 새로운 기술을 배우는 건 그에게 몹시 즐거운 일이죠!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/locale.coffee b/app/locale/locale.coffee index 1fcf2e202..34e59f3f7 100644 --- a/app/locale/locale.coffee +++ b/app/locale/locale.coffee @@ -26,7 +26,7 @@ module.exports = ar: require './ar' # العربية, Arabic pt: require './pt' # português, Portuguese 'pt-BR': require './pt-BR' # português do Brasil, Portuguese (Brazil) - 'pt-PT': require './pt-PT' # Português europeu, Portuguese (Portugal) + 'pt-PT': require './pt-PT' # Português (Portugal), Portuguese (Portugal) pl: require './pl' # język polski, Polish it: require './it' # italiano, Italian tr: require './tr' # Türkçe, Turkish @@ -54,7 +54,8 @@ module.exports = he: require './he' # עברית, Hebrew lt: require './lt' # lietuvių kalba, Lithuanian sr: require './sr' # српски, Serbian - uk: require './uk' # українська мова, Ukranian + uk: require './uk' # українська мова, Ukrainian hi: require './hi' # मानक हिन्दी, Hindi ur: require './ur' # اُردُو, Urdu ms: require './ms' # Bahasa Melayu, Bahasa Malaysia + ca: require './ca' # Català, Catalan diff --git a/app/locale/lt.coffee b/app/locale/lt.coffee index 92881be9d..617b89185 100644 --- a/app/locale/lt.coffee +++ b/app/locale/lt.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith # blog: "Blog" # forum: "Forum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" # admin: "Admin" # home: "Home" # contribute: "Contribute" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith # new_password: "New Password" # new_password_verify: "Verify" # email_subscriptions: "Email Subscriptions" +# email_subscriptions_none: "No Email Subscriptions." # email_announcements: "Announcements" # email_announcements_description: "Get emails on the latest news and developments at CodeCombat." # email_notifications: "Notifications" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." # contributor_emails: "Contributor Class Emails" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith # general: # and: "and" # name: "Name" +# date: "Date" # body: "Body" # version: "Version" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/ms.coffee b/app/locale/ms.coffee index 7cb553d0c..7430592c5 100644 --- a/app/locale/ms.coffee +++ b/app/locale/ms.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa # blog: "Blog" # forum: "Forum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" # admin: "Admin" home: "Halaman" contribute: "Sumbangan" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa new_password: "Kata-laluan baru" new_password_verify: "Verifikasi" # email_subscriptions: "Email Subscriptions" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Pengumuman" # email_announcements_description: "Get emails on the latest news and developments at CodeCombat." email_notifications: "Notifikasi" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." # contributor_emails: "Contributor Class Emails" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa general: and: "dan" name: "Nama" +# date: "Date" # body: "Body" version: "Versi" commit_msg: "Mesej Commit" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." legal: page_title: "Undang-Undang" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/nb.coffee b/app/locale/nb.coffee index 75eb89ca4..118b34c64 100644 --- a/app/locale/nb.coffee +++ b/app/locale/nb.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg blog: "Blogg" forum: "Forum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Administrator" home: "Hjem" contribute: "Bidra" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg new_password: "Nytt Passord" new_password_verify: "Verifiser" email_subscriptions: "Epost Abonnement" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Kunngjøringer" email_announcements_description: "Få epost om siste nytt og utvikling fra CodeCombat." # email_notifications: "Notifications" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." contributor_emails: "Contributor Klasse Epost" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg general: # and: "and" name: "Navn" +# date: "Date" # body: "Body" # version: "Version" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/nl-BE.coffee b/app/locale/nl-BE.coffee index 01c4c9dcc..2a29bdbf3 100644 --- a/app/locale/nl-BE.coffee +++ b/app/locale/nl-BE.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription: blog: "Blog" forum: "Forum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Administrator" home: "Home" contribute: "Bijdragen" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription: new_password: "Nieuw Wachtwoord" new_password_verify: "Verifieer" email_subscriptions: "E-mail Abonnementen" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Aankondigingen" email_announcements_description: "Verkrijg emails over het laatste nieuws en de ontwikkelingen bij CodeCombat." email_notifications: "Notificaties" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." contributor_emails: "Medewerker Klasse emails" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription: clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" editor: main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription: level_search_title: "Zoek Levels Hier" # achievement_search_title: "Search Achievements" read_only_warning2: "Pas op, je kunt geen aanpassingen opslaan hier, want je bent niet ingelogd." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" article: edit_btn_preview: "Voorbeeld" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription: general: and: "en" name: "Naam" +# date: "Date" body: "Inhoud" version: "Versie" commit_msg: "Commit Bericht" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription: nick_description: "Getalenteerde programmeur, excentriek gemotiveerd, een rasechte experimenteerder. Nick kan alles en kiest ervoor om CodeCombat te ontwikkelen." jeremy_description: "Klantenservice Manager, usability tester en gemeenschapsorganisator; Je hebt waarschijnlijk al gesproken met Jeremy." michael_description: "Programmeur, sys-admin, en technisch wonderkind, Michael is de persoon die onze servers draaiende houdt." - glen_description: "Programmeur en gepassioneerde game developer, met de motivatie om de wereld te verbeteren, door het ontwikkelen van de dingen die belangrijk zijn. Het woord onmogelijk staat niet in zijn woordenboek. Nieuwe vaardigheden leren is een plezier voor him!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." legal: page_title: "Legaal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription: introduction_desc_github_url: "CodeCombat is volledig open source" introduction_desc_suf: ", en we streven ernaar om op zoveel mogelijk manieren het mogelijk te maken voor u om deel te nemen en dit project van zowel jou als ons te maken." introduction_desc_ending: "We hopen dat je met ons meedoet!" - introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy en Glen" + introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy en Matt" alert_account_message_intro: "Hallo!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." archmage_summary: "Geïnteresserd in het werken aan game graphics, user interface design, database- en serverorganisatie, multiplayer networking, physics, geluid of game engine prestaties? Wil jij helpen een game te bouwen wat anderen leert waar jij goed in bent? We moeten nog veel doen en als jij een ervaren programmeur bent en wil ontwikkelen voor CodeCombat, dan is dit de klasse voor jou. We zouden graag je hulp hebben bij het maken van de beste programmeergame ooit." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription: # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/nl-NL.coffee b/app/locale/nl-NL.coffee index b58479f8d..78351654b 100644 --- a/app/locale/nl-NL.coffee +++ b/app/locale/nl-NL.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription blog: "Blog" forum: "Forum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Administrator" home: "Home" contribute: "Bijdragen" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription new_password: "Nieuw Wachtwoord" new_password_verify: "Verifieer" email_subscriptions: "E-mail Abonnementen" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Aankondigingen" email_announcements_description: "Verkrijg emails over het laatste nieuws en de ontwikkelingen bij CodeCombat." email_notifications: "Notificaties" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." contributor_emails: "Medewerker Klasse emails" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" editor: main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription level_search_title: "Zoek Levels Hier" # achievement_search_title: "Search Achievements" read_only_warning2: "Pas op, je kunt geen aanpassingen opslaan hier, want je bent niet ingelogd." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" article: edit_btn_preview: "Voorbeeld" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription general: and: "en" name: "Naam" +# date: "Date" body: "Inhoud" version: "Versie" commit_msg: "Commit Bericht" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription nick_description: "Getalenteerde programmeur, excentriek gemotiveerd, een rasechte experimenteerder. Nick kan alles en kiest ervoor om CodeCombat te ontwikkelen." jeremy_description: "Klantenservice Manager, usability tester en gemeenschapsorganisator; Je hebt waarschijnlijk al gesproken met Jeremy." michael_description: "Programmeur, sys-admin, en technisch wonderkind, Michael is de persoon die onze servers draaiende houdt." - glen_description: "Programmeur en gepassioneerde game developer, met de motivatie om de wereld te verbeteren, door het ontwikkelen van de dingen die belangrijk zijn. Het woord onmogelijk staat niet in zijn woordenboek. Nieuwe vaardigheden leren is een plezier voor him!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." legal: page_title: "Legaal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription introduction_desc_github_url: "CodeCombat is volledig open source" introduction_desc_suf: ", en we streven ernaar om op zoveel mogelijk manieren het mogelijk te maken voor u om deel te nemen en dit project van zowel jou als ons te maken." introduction_desc_ending: "We hopen dat je met ons meedoet!" - introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy en Glen" + introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy en Matt" alert_account_message_intro: "Hallo!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." archmage_summary: "Geïnteresserd in het werken aan game graphics, user interface design, database- en serverorganisatie, multiplayer networking, physics, geluid of game engine prestaties? Wil jij helpen een game te bouwen wat anderen leert waar jij goed in bent? We moeten nog veel doen en als jij een ervaren programmeur bent en wil ontwikkelen voor CodeCombat, dan is dit de klasse voor jou. We zouden graag je hulp hebben bij het maken van de beste programmeergame ooit." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/nl.coffee b/app/locale/nl.coffee index df70d2ef2..b4278d78c 100644 --- a/app/locale/nl.coffee +++ b/app/locale/nl.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t blog: "Blog" forum: "Forum" account: "Lidmaatschap" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Administrator" home: "Home" contribute: "Bijdragen" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t new_password: "Nieuw Wachtwoord" new_password_verify: "Verifieer" email_subscriptions: "E-mail Abonnementen" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Aankondigingen" email_announcements_description: "Verkrijg emails over het laatste nieuws en de ontwikkelingen bij CodeCombat." email_notifications: "Meldingen" email_notifications_summary: "Instellingen voor gepersonaliseerde, automatische meldingen via e-mail omtrent je activiteit op CodeCombat." email_any_notes: "Alle Meldingen" email_any_notes_description: "Zet alle activiteit-meldingen via e-mail af." +# email_news: "News" email_recruit_notes: "Job Aanbiedingen" email_recruit_notes_description: "Als je zeer goed speelt, zouden we je wel eens kunnen contacteren om je een (betere) job aan te bieden." contributor_emails: "Medewerker Klasse emails" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t clas: "CLAs" community: - level_editor: "Level Bewerker" main_title: "CodeCombat Gemeenschap" - facebook: "Facebook" - twitter: "Twitter" - gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" editor: main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t level_search_title: "Zoek Levels Hier" # achievement_search_title: "Search Achievements" read_only_warning2: "Pas op, je kunt geen aanpassingen opslaan hier, want je bent niet ingelogd." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" article: edit_btn_preview: "Voorbeeld" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t general: and: "en" name: "Naam" +# date: "Date" body: "Inhoud" version: "Versie" commit_msg: "Commit Bericht" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t nick_description: "Getalenteerde programmeur, excentriek gemotiveerd, een rasechte experimenteerder. Nick kan alles en kiest ervoor om CodeCombat te ontwikkelen." jeremy_description: "Klantenservice Manager, usability tester en gemeenschapsorganisator; Je hebt waarschijnlijk al gesproken met Jeremy." michael_description: "Programmeur, sys-admin, en technisch wonderkind, Michael is de persoon die onze servers draaiende houdt." - glen_description: "Programmeur en gepassioneerde game developer, met de motivatie om de wereld te verbeteren, door het ontwikkelen van de dingen die belangrijk zijn. Het woord onmogelijk staat niet in zijn woordenboek. Nieuwe vaardigheden leren is een plezier voor him!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." legal: page_title: "Legaal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t introduction_desc_github_url: "CodeCombat is volledig open source" introduction_desc_suf: ", en we streven ernaar om op zoveel mogelijk manieren het mogelijk te maken voor u om deel te nemen en dit project van zowel jou als ons te maken." introduction_desc_ending: "We hopen dat je met ons meedoet!" - introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy en Glen" + introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy en Matt" alert_account_message_intro: "Hallo!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." archmage_summary: "Geïnteresserd in het werken aan game graphics, user interface design, database- en serverorganisatie, multiplayer networking, physics, geluid of game engine prestaties? Wil jij helpen een game te bouwen wat anderen leert waar jij goed in bent? We moeten nog veel doen en als jij een ervaren programmeur bent en wil ontwikkelen voor CodeCombat, dan is dit de klasse voor jou. We zouden graag je hulp hebben bij het maken van de beste programmeergame ooit." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/nn.coffee b/app/locale/nn.coffee index b4bec0665..b756ff68d 100644 --- a/app/locale/nn.coffee +++ b/app/locale/nn.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No # blog: "Blog" # forum: "Forum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" # admin: "Admin" # home: "Home" # contribute: "Contribute" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No # new_password: "New Password" # new_password_verify: "Verify" # email_subscriptions: "Email Subscriptions" +# email_subscriptions_none: "No Email Subscriptions." # email_announcements: "Announcements" # email_announcements_description: "Get emails on the latest news and developments at CodeCombat." # email_notifications: "Notifications" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." # contributor_emails: "Contributor Class Emails" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No # general: # and: "and" # name: "Name" +# date: "Date" # body: "Body" # version: "Version" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/no.coffee b/app/locale/no.coffee index b2f1f1fcc..e4e40ebb6 100644 --- a/app/locale/no.coffee +++ b/app/locale/no.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr blog: "Blogg" forum: "Forum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Administrator" home: "Hjem" contribute: "Bidra" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr new_password: "Nytt Passord" new_password_verify: "Verifiser" email_subscriptions: "Epostabonnement" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Kunngjøringer" email_announcements_description: "Få epost om siste nytt og utvikling fra CodeCombat." # email_notifications: "Notifications" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." contributor_emails: "Bidragsyterklasse Epost" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr general: # and: "and" name: "Navn" +# date: "Date" # body: "Body" # version: "Version" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/pl.coffee b/app/locale/pl.coffee index ea6b9abf5..8f8edd0fb 100644 --- a/app/locale/pl.coffee +++ b/app/locale/pl.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish blog: "Blog" forum: "Forum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Admin" home: "Główna" contribute: "Współpraca" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish new_password: "Nowe hasło" new_password_verify: "Zweryfikuj" email_subscriptions: "Powiadomienia email" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Ogłoszenia" email_announcements_description: "Otrzymuj powiadomienia o najnowszych wiadomościach i zmianach w CodeCombat." email_notifications: "Powiadomienia" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." contributor_emails: "Powiadomienia asystentów" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" editor: main_title: "Edytory CodeCombat" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish level_search_title: "Przeszukaj poziomy" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" article: edit_btn_preview: "Podgląd" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish general: and: "i" name: "Imię" +# date: "Date" body: "Zawartość" version: "Wersja" commit_msg: "Wiadomość do commitu" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish nick_description: "Programistyczny czarownik, ekscentryczny magik i eksperymentator pełną gębą. Nick może robić cokolwiek, a decyduje się pracować przy CodeCombat." jeremy_description: "Magik od kontaktów z klientami, tester użyteczności i organizator społeczności; prawdopodobnie już rozmawiałeś z Jeremym." michael_description: "Programista, sys-admin, cudowne dziecko studiów technicznych, Michael to osoba utrzymująca nasze serwery online." - glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." legal: page_title: "Nota prawna" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish introduction_desc_github_url: "CodeCombat jest całkowicie open source" introduction_desc_suf: " i zamierzamy zapewnić tak wiele sposobów na współpracę w projekcie jak to tylko możliwe, by był on tak samo nasz, jak i wasz." introduction_desc_ending: "Liczymy, że dołączysz się do nas!" - introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy i Glen" + introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy i Matt" alert_account_message_intro: "Hej tam!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." archmage_summary: "Zainteresowany pracą przy grafice, interfejsie użytkownika, organizacji bazy danych oraz serwera, łączności multiplayer, fizyce, dźwięku lub wydajności silnika gry? Chciałbyś dołączyć się do budowania gry, która pomoże innym nauczyć się umiejętności, które sam posiadasz? Mamy wiele do zrobienia i jeśli jesteś doświadczonym programistą chcącym pomóc w rozwoju CodeCombat, ta klasa jest dla ciebie. Twoja pomoc przy budowaniu najlepszej gry programistycznej w historii będzie nieoceniona." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/pt-BR.coffee b/app/locale/pt-BR.coffee index e5b9c915d..647498a40 100644 --- a/app/locale/pt-BR.coffee +++ b/app/locale/pt-BR.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: blog: "Blog" forum: "Fórum" account: "Conta" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Administrador" home: "Início" contribute: "Contribuir" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: new_password: "Nova Senha" new_password_verify: "Confirmação" email_subscriptions: "Assinaturas para Notícias por Email" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Notícias" email_announcements_description: "Receba emails com as últimas notícias e desenvolvimentos do CodeCombat." email_notifications: "Notificações" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" email_recruit_notes: "Oportunidades de emprego" email_recruit_notes_description: "Se você jogar muito bem, nós podemos lhe contactar para lhe oferecer um emprego (melhor)" contributor_emails: "Emails para as Classes de Contribuidores" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" editor: main_title: "Editores do CodeCombat" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: level_search_title: "Procurar Níveis Aqui" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" article: edit_btn_preview: "Prever" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: general: and: "e" name: "Nome" +# date: "Date" body: "Principal" version: "Versão" commit_msg: "Mensagem do Commit" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: nick_description: "Mago da programação, feiticeiro da motivação excêntrica e experimentador doido. Nick pode fazer qualquer coisa e escolheu desenvolver o CodeCombat." jeremy_description: "Mago em suporte ao consumidor, testador de usabilidade, e organizador da comunidade; você provavelmente já falou com o Jeremy." michael_description: "Programador, administrador de sistemas, e um técnico prodígio não graduado, Michael é a pessoa que mantém os servidores funcionando." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." legal: page_title: "Jurídico" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: introduction_desc_github_url: "CodeCombat é totalmente código aberto" introduction_desc_suf: ", e nosso objetivo é oferecer quantas maneiras forem possíveis para você participar e fazer deste projeto tanto seu como nosso." introduction_desc_ending: "Nós esperamos que você se junte a nossa festa!" - introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" + introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" alert_account_message_intro: "Ei!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." archmage_summary: "Interessado em trabalhar em gráficos do jogo, design de interface de usuário, banco de dados e organização de servidores, networking multiplayer, física, som ou desempenho do motor de jogo? Quer ajudar a construir um jogo para ajudar outras pessoas a aprender o que você é bom? Temos muito a fazer e se você é um programador experiente e quer desenvolver para o CodeCombat, esta classe é para você. Gostaríamos muito de sua ajuda a construir o melhor jogo de programação da história." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/pt-PT.coffee b/app/locale/pt-PT.coffee index bf102682a..f32a9d262 100644 --- a/app/locale/pt-PT.coffee +++ b/app/locale/pt-PT.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: blog: "Blog" forum: "Fórum" account: "Conta" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Administrador" home: "Início" contribute: "Contribuir" @@ -100,12 +103,12 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: for_beginners: "Para Iniciantes" multiplayer: "Multijogador" for_developers: "Para Programadores" - javascript_blurb: "A linguagem da web. Ótima para escrever websites, aplicações da web, jogos HTML5 e servidores." - python_blurb: "Simples mas poderoso, o Python é uma linguagem de programação ótima para propósitos gerais." - coffeescript_blurb: "Sintaxe do Javascript mais agradável." - clojure_blurb: "Um Lisp moderno" - lua_blurb: "Linguagem para scripts de jogos" - io_blurb: "Simples mas obscuro" +# javascript_blurb: "A linguagem da web. Ótima para escrever websites, aplicações da web, jogos HTML5 e servidores." +# python_blurb: "Simples mas poderoso, o Python é uma linguagem de programação ótima para propósitos gerais." +# coffeescript_blurb: "Sintaxe do Javascript mais agradável." +# clojure_blurb: "Um Lisp moderno" +# lua_blurb: "Linguagem para scripts de jogos" +# io_blurb: "Simples mas obscuro" play: choose_your_level: "Escolha o Seu Nível" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: new_password: "Nova Palavra-passe" new_password_verify: "Verificar" email_subscriptions: "Subscrições de E-mail" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Anúncios" email_announcements_description: "Receba e-mails sobre as últimas novidades e desenvolvimentos no CodeCombat." email_notifications: "Notificações" email_notifications_summary: "Controle, de uma forma personalizada e automática, os e-mails de notificações relacionados com a sua atividade no CodeCombat." email_any_notes: "Quaisquer Notificações" email_any_notes_description: "Desative para parar de receber todos os e-mails de notificação de atividade." +# email_news: "News" email_recruit_notes: "Oportunidades de Emprego" email_recruit_notes_description: "Se joga muito bem, podemos contactá-lo para lhe arranjar um (melhor) emprego." contributor_emails: "Subscrições de E-mail (Contribuintes)" @@ -213,10 +218,10 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: # active: "Looking for interview offers now" # inactive: "Not looking for offers right now" # complete: "complete" -# next: "Next" -# next_city: "city?" + next: "Seguinte" + next_city: "cidade?" # next_country: "pick your country." -# next_name: "name?" + next_name: "nome?" # next_short_description: "write a short description." # next_long_description: "describe your desired position." # next_skills: "list at least five skills." @@ -226,39 +231,39 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: # next_links: "add any personal or social links." # next_photo: "add an optional professional photo." # next_active: "mark yourself open to offers to show up in searches." -# example_blog: "Blog" -# example_personal_site: "Personal Site" -# links_header: "Personal Links" + example_blog: "Blog" + example_personal_site: "Sítio Pessoal" + links_header: "Ligações Pessoais" # links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog." -# links_name: "Link Name" -# links_name_help: "What are you linking to?" -# links_link_blurb: "Link URL" + links_name: "Nome da Ligação" + links_name_help: "A que é que está a ligar?" + links_link_blurb: "URL da Ligação" # basics_header: "Update basic info" # basics_active: "Open to Offers" # basics_active_help: "Want interview offers right now?" # basics_job_title: "Desired Job Title" # basics_job_title_help: "What role are you looking for?" -# basics_city: "City" + basics_city: "Cidade" # basics_city_help: "City you want to work in (or live in now)." -# basics_country: "Country" + basics_country: "País" # basics_country_help: "Country you want to work in (or live in now)." # basics_visa: "US Work Status" # basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)" -# basics_looking_for: "Looking For" -# basics_looking_for_full_time: "Full-time" -# basics_looking_for_part_time: "Part-time" -# basics_looking_for_remote: "Remote" + basics_looking_for: "À Procura De" + basics_looking_for_full_time: "Tempo Inteiro" + basics_looking_for_part_time: "Part-time" + basics_looking_for_remote: "Remoto" # basics_looking_for_contracting: "Contracting" # basics_looking_for_internship: "Internship" # basics_looking_for_help: "What kind of developer position do you want?" # name_header: "Fill in your name" -# name_anonymous: "Anonymous Developer" + name_anonymous: "Desenvolvedor Anónimo" # name_help: "Name you want employers to see, like 'Nick Winter'." # short_description_header: "Write a short description of yourself" # short_description_blurb: "Add a tagline to help an employer quickly learn more about you." # short_description: "Tagline" # short_description_help: "Who are you, and what are you looking for? 140 characters max." -# skills_header: "Skills" + skills_header: "Habilidades" # skills_help: "Tag relevant developer skills in order of proficiency." # long_description_header: "Describe your desired position" # long_description_blurb: "Tell employers how awesome you are and what role you want." @@ -266,22 +271,22 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: # long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max." # work_experience: "Work Experience" # work_header: "Chronicle your work history" -# work_years: "Years of Experience" + work_years: "Anos de Experiência" # work_years_help: "How many years of professional experience (getting paid) developing software do you have?" # work_blurb: "List your relevant work experience, most recent first." -# work_employer: "Employer" -# work_employer_help: "Name of your employer." -# work_role: "Job Title" + work_employer: "Empregador" + work_employer_help: "Nome do seu empregador." + work_role: "Título do Emprego" # work_role_help: "What was your job title or role?" -# work_duration: "Duration" + work_duration: "Duração" # work_duration_help: "When did you hold this gig?" -# work_description: "Description" + work_description: "Descrição" # work_description_help: "What did you do there? (140 chars; optional)" -# education: "Education" + education: "Educação" # education_header: "Recount your academic ordeals" # education_blurb: "List your academic ordeals." -# education_school: "School" -# education_school_help: "Name of your school." + education_school: "Escola" + education_school_help: "Nome da sua escola." # education_degree: "Degree" # education_degree_help: "What was your degree and field of study?" # education_duration: "Dates" @@ -312,18 +317,18 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: filter_visa: "Visa" filter_visa_yes: "Autorizado Para Trabalhar Nos EUA" filter_visa_no: "Não Autorizado" -# filter_education_top: "Top School" -# filter_education_other: "Other" -# filter_role_web_developer: "Web Developer" -# filter_role_software_developer: "Software Developer" -# filter_role_mobile_developer: "Mobile Developer" -# filter_experience: "Experience" -# filter_experience_senior: "Senior" -# filter_experience_junior: "Junior" + filter_education_top: "Universidade" + filter_education_other: "Outro" + filter_role_web_developer: "Desenvolvedor da Web" + filter_role_software_developer: "Desenvolvedor de Software" + filter_role_mobile_developer: "Desenvolvedor Mobile" + filter_experience: "Experiência" + filter_experience_senior: "Sénior" + filter_experience_junior: "Júnior" # filter_experience_recent_grad: "Recent Grad" -# filter_experience_student: "College Student" -# filter_results: "results" -# start_hiring: "Start hiring." + filter_experience_student: "Estudante Universitário" + filter_results: "resultados" + start_hiring: "Começar a contratar." # reasons: "Three reasons you should hire through us:" # everyone_looking: "Everyone here is looking for their next opportunity." # everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction." @@ -353,7 +358,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: grid: "Grelha" customize_wizard: "Personalizar Feiticeiro" home: "Início" -# game_menu: "Game Menu" + game_menu: "Menu do Jogo" guide: "Guia" restart: "Reiniciar" goals: "Objetivos" @@ -408,11 +413,11 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: tip_morale_improves: "O carregamento irá continuar até que a moral melhore." tip_all_species: "Acreditamos em oportunidades iguais para todas as espécies, em relação a aprenderem a programar." tip_reticulating: "A reticular espinhas." - tip_harry: "Você é um Feitiçeiro, " -# tip_great_responsibility: "With great coding skill comes great debug responsibility." -# tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep." + tip_harry: "Você é um Feiticeiro, " + tip_great_responsibility: "Com uma grande habilidade de programação vem uma grande responsabilidade de depuração." + tip_munchkin: "Se não comer os seus vegetais, virá um ogre atrás de si enquanto estiver a dormir." tip_binary: "Há apenas 10 tipos de pessoas no mundo: aquelas que percebem binário e aquelas que não." -# tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda" + tip_commitment_yoda: "Um programador deve ter o compromisso mais profundo, a mente mais séria. ~ Yoda" tip_no_try: "Fazer. Ou não fazer. Não há nenhum tentar. - Yoda" tip_patience: "Paciência tu deves ter, jovem Padawan. - Yoda" tip_documented_bug: "Um erro documentado não é um erro; é uma funcionalidade." @@ -428,18 +433,18 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: # infinite_loop_comment_out: "Comment Out My Code" game_menu: -# inventory_tab: "Inventory" -# choose_hero_tab: "Restart Level" -# save_load_tab: "Save/Load" -# options_tab: "Options" -# guide_tab: "Guide" + inventory_tab: "Inventário" + choose_hero_tab: "Reiniciar Nível" + save_load_tab: "Guarde/Carregue" + options_tab: "Opções" + guide_tab: "Guia" multiplayer_tab: "Multijogador" -# inventory_caption: "Equip your hero" -# choose_hero_caption: "Choose hero, language" -# save_load_caption: "... and view history" -# options_caption: "Configure settings" -# guide_caption: "Docs and tips" -# multiplayer_caption: "Play with friends!" + inventory_caption: "Equipe o seu herói" + choose_hero_caption: "Escolha o herói, a linguagem" + save_load_caption: "... e veja o histórico" + options_caption: "Configure as definições" + guide_caption: "Documentos e dicas" + multiplayer_caption: "Jogue com amigos!" # inventory: # temp: "Temp" @@ -447,41 +452,41 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: # choose_hero: # temp: "Temp" -# save_load: -# granularity_saved_games: "Saved" -# granularity_change_history: "History" + save_load: + granularity_saved_games: "Guardados" + granularity_change_history: "Histórico" options: -# general_options: "General Options" -# music_label: "Music" -# music_description: "Turn background music on/off." -# autorun_label: "Autorun" -# autorun_description: "Control automatic code execution." + general_options: "Opções Gerais" + music_label: "Música" + music_description: "Ative ou desative a música de fundo." + autorun_label: "Executar Automaticamente" + autorun_description: "Controlar a execução automática do código." editor_config: "Configurar Editor" editor_config_title: "Configurar Editor" editor_config_level_language_label: "Linguagem para Este Nível" - editor_config_level_language_description: "Define a linguagem de programação para este nível em particular." + editor_config_level_language_description: "Definir a linguagem de programação para este nível em particular." editor_config_default_language_label: "Linguagem de Programação Predefinida" - editor_config_default_language_description: "Define a linguagem de programação na qual deseja programar aquando do começo de novos níveis." + editor_config_default_language_description: "Definir a linguagem de programação na qual deseja programar aquando do começo de novos níveis." editor_config_keybindings_label: "Atalhos do Teclado" editor_config_keybindings_default: "Predefinição (Ace)" - editor_config_keybindings_description: "Adiciona atalhos de teclado adicionais conhecidos dos editores comuns." + editor_config_keybindings_description: "Adicionar atalhos de teclado adicionais conhecidos dos editores comuns." editor_config_livecompletion_label: "Auto-completação em Tempo Real" - editor_config_livecompletion_description: "Mostra sugestões de auto-completação aquando da escrita." + editor_config_livecompletion_description: "Mostrar sugestões de auto-completação aquando da escrita." editor_config_invisibles_label: "Mostrar Invisíveis" - editor_config_invisibles_description: "Mostra invisíveis tais como espaços e tabulações." + editor_config_invisibles_description: "Mostrar invisíveis tais como espaços e tabulações." editor_config_indentguides_label: "Mostrar Guias de Indentação" - editor_config_indentguides_description: "Mostra linhas verticais para se ver melhor a indentação." + editor_config_indentguides_description: "Mostrar linhas verticais para se ver melhor a indentação." editor_config_behaviors_label: "Comportamentos Inteligentes" - editor_config_behaviors_description: "Auto-completa parênteses, chavetas e aspas." + editor_config_behaviors_description: "Auto-completar parênteses, chavetas e aspas." # guide: # temp: "Temp" multiplayer: multiplayer_title: "Definições Multijogador" -# multiplayer_toggle: "Enable multiplayer" -# multiplayer_toggle_description: "Allow others to join your game." + multiplayer_toggle: "Ativar multijogador" + multiplayer_toggle_description: "Permita que outros se juntem ao seu jogo." multiplayer_link_description: "Dê esta ligação a alguém para se juntar a si." multiplayer_hint_label: "Dica:" multiplayer_hint: " Clique na ligação para selecionar tudo. Depois carregue em ⌘-C ou Ctrl-C para copiá-la." @@ -504,7 +509,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: # toggle_grid: "Toggle grid overlay." # toggle_pathfinding: "Toggle pathfinding overlay." # beautify: "Beautify your code by standardizing its formatting." - move_wizard: "Mover o seu Feitiçeiro pelo nível." + move_wizard: "Mover o seu Feiticeiro pelo nível." admin: av_title: "Vistas de Administrador" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: clas: "CLA's" community: - level_editor: "Editor de Níveis" main_title: "Comunidade do CodeCombat" - facebook: "Facebook" - twitter: "Twitter" - gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" editor: main_title: "Editores do CodeCombat" @@ -547,7 +557,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: grassy: "Com Relva" fork_title: "Bifurcar Nova Versão" fork_creating: "A Criar Bifurcação..." -# randomize: "Randomize" + randomize: "Randomizar" more: "Mais" wiki: "Wiki" live_chat: "Chat Ao Vivo" @@ -561,8 +571,8 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: level_tab_thangs_all: "Todos" level_tab_thangs_conditions: "Condições Iniciais" level_tab_thangs_add: "Adicionar Thangs" -# delete: "Delete" -# duplicate: "Duplicate" + delete: "Eliminar" + duplicate: "Duplicar" level_settings_title: "Configurações" level_component_tab_title: "Componentes Atuais" level_component_btn_new: "Criar Novo Componente" @@ -572,7 +582,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: level_components_title: "Voltar para Todos os Thangs" level_components_type: "Tipo" level_component_edit_title: "Editar Componente" -# level_component_config_schema: "Config Schema" + level_component_config_schema: "Configurar Esquema" level_component_settings: "Configurações" level_system_edit_title: "Editar Sistema" create_system_title: "Criar Novo Sistema" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: level_search_title: "Procurar Níveis Aqui" achievement_search_title: "Procurar Conquistas" read_only_warning2: "Nota: não pode guardar nenhuma edição feita aqui, porque não tem sessão iniciada." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" article: edit_btn_preview: "Pré-visualizar" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: general: and: "e" name: "Nome" +# date: "Date" body: "Corpo" version: "Versão" commit_msg: "Enviar Mensagem" @@ -626,28 +641,28 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: hard: "Difícil" player: "Jogador" -# about: -# who_is_codecombat: "Who is CodeCombat?" -# why_codecombat: "Why CodeCombat?" -# who_description_prefix: "together started CodeCombat in 2013. We also created " -# who_description_suffix: "in 2008, growing it to the #1 web and iOS application for learning to write Chinese and Japanese characters." -# who_description_ending: "Now it's time to teach people to write code." -# why_paragraph_1: "When making Skritter, George didn't know how to program and was constantly frustrated by his inability to implement his ideas. Afterwards, he tried learning, but the lessons were too slow. His housemate, wanting to reskill and stop teaching, tried Codecademy, but \"got bored.\" Each week another friend started Codecademy, then dropped off. We realized it was the same problem we'd solved with Skritter: people learning a skill via slow, intensive lessons when what they need is fast, extensive practice. We know how to fix that." -# why_paragraph_2: "Need to learn to code? You don't need lessons. You need to write a lot of code and have a great time doing it." -# why_paragraph_3_prefix: "That's what programming is about. It's gotta be fun. Not fun like" -# why_paragraph_3_italic: "yay a badge" -# why_paragraph_3_center: "but fun like" -# why_paragraph_3_italic_caps: "NO MOM I HAVE TO FINISH THE LEVEL!" -# why_paragraph_3_suffix: "That's why CodeCombat is a multiplayer game, not a gamified lesson course. We won't stop until you can't stop--but this time, that's a good thing." -# why_paragraph_4: "If you're going to get addicted to some game, get addicted to this one and become one of the wizards of the tech age." -# why_ending: "And hey, it's free. " -# why_ending_url: "Start wizarding now!" -# george_description: "CEO, business guy, web designer, game designer, and champion of beginning programmers everywhere." -# scott_description: "Programmer extraordinaire, software architect, kitchen wizard, and master of finances. Scott is the reasonable one." -# nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." -# jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." -# michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" + about: + who_is_codecombat: "Quem é o CodeCombat?" + why_codecombat: "Porquê o CodeCombat?" + who_description_prefix: "começaram juntos o CodeCombat em 2013. Também criaram o " + who_description_suffix: "em 2008, tornando-o a aplicação nº1 da web e iOS para aprender a escrever caracteteres Chineses e Japoneses." + who_description_ending: "Agora, está na altura de ensinar as pessoas a escrever código." + why_paragraph_1: "Aquando da conceção do Skritter, o George não sabia programar e estava constantemente frustrado devido à sua inabilidade para implementar as ideias dele. Mais tarde, tentou aprender, mas as aulas eram muito lentas. O seu colega de quarto, numa tentativa de melhorar as suas habilidades e parar de ensinar, tentou o Codecademy, mas \"aborreceu-se.\" A cada semana, um outro amigo começava no Codecademy, mas desistia sempre. Apercebemo-nos de que era o mesmo problema que resolveríamos com o Skritter: pessoas a aprender uma habilidade através de aulas lentas e intensivas, quando o que precisam é de praticar rápida e extensivamente. Nós sabemos como resolver isso." + why_paragraph_2: "Precisa de aprender a programar? Não precisa de aulas. Precisa sim de escrever muito código e passar um bom bocado enquanto o faz." + why_paragraph_3_prefix: "Afinal, é sobre isso que é a programação. Tem de ser divertida. Não divertida do género" + why_paragraph_3_italic: "yay uma medalha" + why_paragraph_3_center: "mas sim divertida do género" + why_paragraph_3_italic_caps: "NÃO MÃE, TENHO DE ACABAR O NÍVEL!" + why_paragraph_3_suffix: "É por isso que o CodeCombat é um jogo multijogador, e não um jogo que não passa de um curso com lições. Nós não vamos parar enquanto não puderes parar--mas desta vez, isso é uma coisa boa." + why_paragraph_4: "Se vais ficar viciado em algum jogo, vicia-te neste e torna-te num dos feiticeiros da idade da tecnologia." + why_ending: "E vejam só, é gratuito. " + why_ending_url: "Comece a enfeitiçar agora!" + george_description: "CEO, homem de negócios, designer da web, designer de jogos e campeão dos programadores iniciantes de todo o lado." + scott_description: "Programador extraordinário, arquiteto de software, feiticeiro da cozinha e mestre das finanças. O Scott é sensato." + nick_description: "Feiticeiro da programção, mago da motivação excêntrico e experimentador de pernas para o ar. O Nick pode fazer qualquer coisa e escolhe construir o CodeCombat." + jeremy_description: "Mago do suporte ao cliente, testador do uso e organizador da comunidade; provavelmente já falou com o Jeremy." + michael_description: "Programador, administrador do sistema e técnico de graduação prodígio, o Michael é a pessoa que mantém os nossos servidores online." +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." legal: page_title: "Legal" @@ -712,13 +727,13 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: contribute: page_title: "Contribuir" -# character_classes_title: "Character Classes" -# introduction_desc_intro: "We have high hopes for CodeCombat." + character_classes_title: "Classes de Personagens" + introduction_desc_intro: "Temos esperanças elevadas para o CodeCombat." # introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, " -# introduction_desc_github_url: "CodeCombat is totally open source" + introduction_desc_github_url: "o CodeCombat é totalmente open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." -# introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" + introduction_desc_ending: "Esperemos que se junte a nós!" + introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy e Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -787,7 +802,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: # ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!" more_about_ambassador: "Aprenda Mais Sobre Tornar-se um Embaixador" # ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments." -# changes_auto_save: "Changes are saved automatically when you toggle checkboxes." + changes_auto_save: "As alterações são guardadas automaticamente quando clica nas caixas." diligent_scribes: "Os Nossos Dedicados Escrivões:" powerful_archmages: "Os Nossos Poderosos Arcomagos:" creative_artisans: "Os Nossos Creativos Artesãos:" @@ -834,12 +849,12 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: rank_failed: "Falhou a Classificar" rank_being_ranked: "Jogo a ser Classificado" # rank_last_submitted: "submitted " -# help_simulate: "Help simulate games?" - code_being_simulated: "O teu código está a ser simulado por outros jogadores, para ser classificado. Isto será actualizado quando surgirem novas partidas." + help_simulate: "Ajudar a simular jogos?" + code_being_simulated: "O seu novo código está a ser simulado por outros jogadores, para ser classificado. Isto será atualizado quando surgirem novas partidas." no_ranked_matches_pre: "Sem jogos classificados pela equipa " no_ranked_matches_post: "! Joga contra alguns adversários e volta aqui para veres o teu jogo classificado." - choose_opponent: "Escolhe um Adversário" -# select_your_language: "Select your language!" + choose_opponent: "Escolha um Adversário" + select_your_language: "Selecione a sua linguagem!" tutorial_play: "Jogar Tutorial" tutorial_recommended: "Recomendado se nunca jogou antes" tutorial_skip: "Saltar Tutorial" @@ -848,40 +863,40 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: simple_ai: "Inteligência Artificial Simples" warmup: "Aquecimento" vs: "VS" -# friends_playing: "Friends Playing" -# log_in_for_friends: "Log in to play with your friends!" -# social_connect_blurb: "Connect and play against your friends!" -# invite_friends_to_battle: "Invite your friends to join you in battle!" -# fight: "Fight!" -# watch_victory: "Watch your victory" -# defeat_the: "Defeat the" -# tournament_ends: "Tournament ends" -# tournament_ended: "Tournament ended" -# tournament_rules: "Tournament Rules" -# tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details" -# tournament_blurb_blog: "on our blog" + friends_playing: "Amigos a Jogar" + log_in_for_friends: "Inicie sessão para jogar com os seus amigos!" + social_connect_blurb: "Conecte-se e jogue contra os seus amigos!" + invite_friends_to_battle: "Convide os seus amigos para se juntarem a si em batalha!" + fight: "Lutar!" + watch_victory: "Veja a sua vitória" + defeat_the: "Derrote o" + tournament_ends: "O Torneio acaba" + tournament_ended: "O Torneio acabou" + tournament_rules: "Regras do Torneio" + tournament_blurb: "Escreva código, recolha ouro, construa exércitos, esmague inimigos, ganhe prémios e melhore a sua carreira no nosso torneio $40,000 Greed! Confira os detalhes" + tournament_blurb_blog: "no nosso blog" rules: "Regras" winners: "Vencedores" -# ladder_prizes: -# title: "Tournament Prizes" -# blurb_1: "These prizes will be awarded according to" -# blurb_2: "the tournament rules" -# blurb_3: "to the top human and ogre players." -# blurb_4: "Two teams means double the prizes!" -# blurb_5: "(There will be two first place winners, two second-place winners, etc.)" -# rank: "Rank" -# prizes: "Prizes" -# total_value: "Total Value" -# in_cash: "in cash" -# custom_wizard: "Custom CodeCombat Wizard" -# custom_avatar: "Custom CodeCombat avatar" -# heap: "for six months of \"Startup\" access" -# credits: "credits" -# one_month_coupon: "coupon: choose either Rails or HTML" -# one_month_discount: "discount, 30% off: choose either Rails or HTML" -# license: "license" -# oreilly: "ebook of your choice" + ladder_prizes: + title: "Prémios do Torneio" + blurb_1: "Estes prémios serão entregues de acordo com" + blurb_2: "as regras do torneio" + blurb_3: "aos melhores jogadores humanos e ogres." + blurb_4: "Duas equipas significam o dobro dos prémios!" + blurb_5: "(Haverá dois vencedores em primeiro lugar, dois em segundo, etc.)" + rank: "Classificação" + prizes: "Prémios" + total_value: "Valor Total" + in_cash: "em dinheiro" + custom_wizard: "Um Feiticeiro do CodeCombat Personalizado" + custom_avatar: "Um Avatar do CodeCombat Personalizado" + heap: "para seis meses de acesso \"Startup\"" + credits: "créditos" + one_month_coupon: "cupão: escolha Rails ou HTML" + one_month_discount: "desconto de 30%: escolha Rails ou HTML" + license: "licença" + oreilly: "ebook à sua escolha" loading_error: could_not_load: "Erro ao carregar do servidor" @@ -909,8 +924,8 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: # user_schema: "User Schema" # user_profile: "User Profile" # patches: "Patches" -# patched_model: "Source Document" -# model: "Model" + patched_model: "Documento Fonte" + model: "Modelo" system: "Sistema" component: "Componente" components: "Componentes" @@ -921,20 +936,55 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: article: "Artigo" # user_names: "User Names" # thang_names: "Thang Names" -# files: "Files" + files: "Ficheiros" # top_simulators: "Top Simulators" -# source_document: "Source Document" + source_document: "Documento Fonte" document: "Documento" # sprite_sheet: "Sprite Sheet" # candidate_sessions: "Candidate Sessions" # user_remark: "User Remark" versions: "Versões" -# delta: -# added: "Added" -# modified: "Modified" -# deleted: "Deleted" -# moved_index: "Moved Index" -# text_diff: "Text Diff" -# merge_conflict_with: "MERGE CONFLICT WITH" -# no_changes: "No Changes" + delta: + added: "Adicionados/as" + modified: "Modificados/as" + deleted: "Eliminados/as" + moved_index: "Índice Movido" + text_diff: "Diferença de Texto" + merge_conflict_with: "FUNDIR CONFLITO COM" + no_changes: "Sem Alterações" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/pt.coffee b/app/locale/pt.coffee index 17f9fb828..cc39eaa49 100644 --- a/app/locale/pt.coffee +++ b/app/locale/pt.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues blog: "Blog" forum: "Fórum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Administrador" home: "Início" contribute: "Contribuir" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues new_password: "Nova Senha" new_password_verify: "Confirmação" email_subscriptions: "Assinaturas para Notícias por Email" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Notícias" email_announcements_description: "Receba emails com as últimas notícias e desenvolvimentos do CodeCombat." # email_notifications: "Notifications" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." contributor_emails: "Emails para as Classes de Contribuidores" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues general: # and: "and" name: "Nome" +# date: "Date" # body: "Body" # version: "Version" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/ro.coffee b/app/locale/ro.coffee index ed13d5ec7..48a4c9226 100644 --- a/app/locale/ro.coffee +++ b/app/locale/ro.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman blog: "Blog" forum: "Forum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Admin" home: "Acasa" contribute: "Contribuie" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman new_password: "Parolă nouă" new_password_verify: "Verifică" email_subscriptions: "Subscripție Email" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Anunțuri" email_announcements_description: "Primește email-uri cu ultimele știri despre CodeCombat." email_notifications: "Notificări" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." contributor_emails: "Contributor Class Emails" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" editor: main_title: "Editori CodeCombat" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman level_search_title: "Caută nivele aici" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" article: edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman general: and: "și" name: "Nume" +# date: "Date" body: "Corp" version: "Versiune" commit_msg: "Înregistrează Mesajul" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick poate să facă orice si a ales să dezvolte CodeCombat." jeremy_description: "Customer support mage, usability tester, and community organizer; probabil ca ați vorbit deja cu Jeremy." michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael este cel care ține serverele in picioare." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." legal: page_title: "Aspecte Legale" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman introduction_desc_github_url: "CodeCombat este complet open source" introduction_desc_suf: ", și ne propunem să vă punem la dispoziție pe cât de mult posibil modalități de a lua parte la acest proiect pentru a-l face la fel de mult as vostru cât și al nostru." introduction_desc_ending: "Sperăm să vă placă petrecerea noastră!" - introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy și Glen" + introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy și Matt" alert_account_message_intro: "Salutare!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." archmage_summary: "Interesat să lucrezi la grafica jocului, interfața grafică cu utilizatorul, baze de date și organizare server, multiplayer networking, fizică, sunet, sau performanțe game engine? Vrei să ajuți la construirea unui joc pentru a învăța pe alții ceea ce te pricepi? Avem o grămadă de făcut dacă ești un programator experimentat și vrei sa dezvolți pentru CodeCombat, această clasă este pentru tine. Ne-ar plăcea să ne ajuți să construim cel mai bun joc de programare făcut vreodată." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee index fab79b66d..c048edf9f 100644 --- a/app/locale/ru.coffee +++ b/app/locale/ru.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi blog: "Блог" forum: "Форум" account: "Аккаунт" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Админ" home: "Домой" contribute: "Сотрудничество" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi new_password: "Новый пароль" new_password_verify: "Подтверждение пароля" email_subscriptions: "Email-подписки" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Оповещения" email_announcements_description: "Получать email-оповещения о последних новостях CodeCombat." email_notifications: "Уведомления" email_notifications_summary: "Настройки автоматических email-уведомлений, основанных на вашей активности на CodeCombat." email_any_notes: "Все уведомления" email_any_notes_description: "Отключите, чтобы больше не получать извещения." +# email_news: "News" email_recruit_notes: "Возможности для работы" email_recruit_notes_description: "Если вы действительно хорошо играете, то мы можем связаться с вами для предложения (лучшей) работы." contributor_emails: "Рассылки по классам участников" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi clas: "ЛСС" community: - level_editor: "редактор уровней" main_title: "Сообщество CodeCombat" - facebook: "Facebook" - twitter: "Twitter" - gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" editor: main_title: "Редакторы CodeCombat" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi level_search_title: "Искать уровни" achievement_search_title: "Искать достижения" read_only_warning2: "Примечание: вы не можете сохранять любые правки здесь, потому что вы не авторизованы." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" article: edit_btn_preview: "Предпросмотр" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi general: and: "и" name: "Имя" +# date: "Date" body: "Содержание" version: "Версия" commit_msg: "Сопроводительное сообщение" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi nick_description: "Маг программирования, мудрец эксцентричного мотивирования и чудаковатый экспериментатор. Ник может всё и хочет построить CodeCombat." jeremy_description: "Маг клиентской поддержки, юзабилити-тестер, и организатор сообщества; вы наверняка уже говорили с Джереми." michael_description: "Программист, сисадмин и непризнанный технический гений, Михаэль является лицом, поддерживающим наши серверы в доступности." - glen_description: "Программист и страстный разработчик игр, с мотивацией сделать этот мир лучше путём разработки действительно значащих вещей. Слова \"невозможно\" нет в его словаре. Освоение новых навыков его развлечение!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." legal: page_title: "Юридическая информация" @@ -938,3 +953,38 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi text_diff: "Разница" # merge_conflict_with: "MERGE CONFLICT WITH" no_changes: "Нет изменений" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/sk.coffee b/app/locale/sk.coffee index dc63b602c..28d0b324a 100644 --- a/app/locale/sk.coffee +++ b/app/locale/sk.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", blog: "Blog" forum: "Fórum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Spravuj" home: "Domov" contribute: "Prispej" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", new_password: "Nové heslo" new_password_verify: "Overenie" # email_subscriptions: "Email Subscriptions" +# email_subscriptions_none: "No Email Subscriptions." # email_announcements: "Announcements" # email_announcements_description: "Get emails on the latest news and developments at CodeCombat." # email_notifications: "Notifications" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." # contributor_emails: "Contributor Class Emails" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", general: # and: "and" name: "Meno" +# date: "Date" # body: "Body" # version: "Version" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/sl.coffee b/app/locale/sl.coffee index 78798520b..2ae16b022 100644 --- a/app/locale/sl.coffee +++ b/app/locale/sl.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven # blog: "Blog" # forum: "Forum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" # admin: "Admin" # home: "Home" # contribute: "Contribute" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven # new_password: "New Password" # new_password_verify: "Verify" # email_subscriptions: "Email Subscriptions" +# email_subscriptions_none: "No Email Subscriptions." # email_announcements: "Announcements" # email_announcements_description: "Get emails on the latest news and developments at CodeCombat." # email_notifications: "Notifications" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." # contributor_emails: "Contributor Class Emails" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven # general: # and: "and" # name: "Name" +# date: "Date" # body: "Body" # version: "Version" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/sr.coffee b/app/locale/sr.coffee index e551f1983..4ad284ac3 100644 --- a/app/locale/sr.coffee +++ b/app/locale/sr.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian blog: "Блог" forum: "Форум" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Админ" home: "Почетна" contribute: "Допринеси" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian new_password: "Нова Шифра" new_password_verify: "Потврди" email_subscriptions: "Мејл претплате" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Обавештења" email_announcements_description: "Прими мејл за најновије вести и достигнућа на CodeCombat-у" # email_notifications: "Notifications" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." contributor_emails: "Мејлови реда сарадника" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian general: # and: "and" name: "Име" +# date: "Date" # body: "Body" # version: "Version" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/sv.coffee b/app/locale/sv.coffee index 55576a617..12eefbd4e 100644 --- a/app/locale/sv.coffee +++ b/app/locale/sv.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr blog: "Blogg" forum: "Forum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Admin" home: "Hem" contribute: "Bidra" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr new_password: "Nytt lösenord" new_password_verify: "Verifiera" email_subscriptions: "E-postsprenumerationer" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Meddelanden" email_announcements_description: "Få e-post med de senaste nyheterna och utvecklingen på CodeCombat." email_notifications: "Påminnelser" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." contributor_emails: "E-post för bidragare" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" editor: main_title: "CodeCombatredigerare" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr level_search_title: "Sök nivåer här" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" article: edit_btn_preview: "Förhandsgranska" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr general: and: "och" name: "Namn" +# date: "Date" body: "Kropp" version: "Version" commit_msg: "Förbindelsemeddelande" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr nick_description: "Programmeringstrollkarl, excentrisk motivationsmagiker och upp-och-ner-experimenterare. Nick kan göra vad som helst och väljer att bygga CodeCombat." jeremy_description: "Kundsupportsmagiker, användbarhetstestare och gemenskapsorganisatör; du har förmodligen redan pratat med Jeremy." michael_description: "Programmerare, sys-admin, och studerande tekniskt underbarn, Michael är personen som håller våra servrar online." - glen_description: "Programmerare och passionerad spelutvecklare, med motivationen att göra denna värld till ett bättre ställe genom att utveckla saker som spelar roll. Ordet omöjligt finns inte i hans ordbok. Att lära sig nya färdigheter är hans lycka." +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." legal: page_title: "Juridik" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr introduction_desc_github_url: "CodeCombat is totally open source" introduction_desc_suf: ", och vi siktar på att tillhandahålla så många sätt som möjligt för dig att delta och göra det här projektet till lika mycket ditt som vårt." introduction_desc_ending: "Vi hoppas att du vill vara med!" - introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy och Glen" + introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy och Matt" alert_account_message_intro: "Hej där!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." archmage_summary: "Intresserad av att jobba med spelgrafik, användargränssnittsdesign, databas- och serveroptimering, flerspelarnätverkadnde, fysik, ljud eller spelmotorprestation? Vill du hjälpa till att bygga ett spel för att hjälpa andra människor lära sig det du är bra på? Vi har mycket att göra och om du är en erfaren programmerare och vill utveckla för CodeCombat är denna klassen för dig. Vi skulle älska din hjälp med att bygga det bästa programmeringsspelet någonsin." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/th.coffee b/app/locale/th.coffee index ae017455b..10b480b97 100644 --- a/app/locale/th.coffee +++ b/app/locale/th.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra blog: "บล็อก" forum: "กระดานสนทนา" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "ผู้ดูแลระบบ" home: "Home" contribute: "สนับสนุน" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra new_password: "รหัสผ่านใหม่" # new_password_verify: "Verify" # email_subscriptions: "Email Subscriptions" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "ประกาศ" # email_announcements_description: "Get emails on the latest news and developments at CodeCombat." # email_notifications: "Notifications" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." # contributor_emails: "Contributor Class Emails" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra # general: # and: "and" # name: "Name" +# date: "Date" # body: "Body" # version: "Version" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/tr.coffee b/app/locale/tr.coffee index fe09441c4..23901b6ce 100644 --- a/app/locale/tr.coffee +++ b/app/locale/tr.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t blog: "Blog" forum: "Forum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Yönetici" home: "Anasayfa" contribute: "Katkıda bulun" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t new_password: "Yeni Şifre" new_password_verify: "Teyit Et" email_subscriptions: "E-posta Abonelikleri" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Duyurular" email_announcements_description: "CodeCombat ile ilgili son haberlere ve gelişmelere ulaşın." email_notifications: "Bilgilendirme" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." contributor_emails: "İştirakçi Sınıfı E-postaları" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" editor: main_title: "CodeCombat Düzenleyici" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t level_search_title: "Seviye ara" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" article: edit_btn_preview: "Önizleme" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t general: and: "ve" name: "İsim" +# date: "Date" body: "Gövde" version: "Sürüm" commit_msg: "Gönderme İletisi" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t nick_description: "Programlama sihirbazı, tuhaf motivasyon büyücü ve tersine mühendis. Nick her şeyden anlar ve şu anda CodeCombat'i inşa etmekle meşgul." jeremy_description: "Müşteri hizmetleri büyücüsü, kullanılabilirlik test edicisi ve topluluk örgütleyici; muhtemelen Jeremy ile konuşmuşluğunuz vardır." michael_description: "Programcı, sistem yöneticisi, halihazırda üniversite okuyan teknik-harika-çocuk. Michael sunucularımızı ayakta tutan adamın ta kendisi." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." legal: page_title: "Hukuki" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t introduction_desc_github_url: "CodeCombat tümüyle açık kaynaklıdır" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" alert_account_message_intro: "Merhaba!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/uk.coffee b/app/locale/uk.coffee index 17417a8b9..ec5fd37b2 100644 --- a/app/locale/uk.coffee +++ b/app/locale/uk.coffee @@ -1,4 +1,4 @@ -module.exports = nativeDescription: "українська мова", englishDescription: "Ukranian", translation: +module.exports = nativeDescription: "українська мова", englishDescription: "Ukrainian", translation: common: loading: "Завантаження..." saving: "Збереження..." @@ -49,6 +49,9 @@ module.exports = nativeDescription: "українська мова", englishDesc blog: "Блог" forum: "Форум" account: "Акаунт" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Адміністратор" home: "На головну" contribute: "Співпраця" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "українська мова", englishDesc new_password: "Новий пароль" new_password_verify: "Підтвердження паролю" email_subscriptions: "Email-підписки" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Оголошення" email_announcements_description: "Отримувати електронні листи про останні новини CodeCombat." email_notifications: "Нотифікації" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." contributor_emails: "Підписки за класами учасників" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "українська мова", englishDesc clas: "CLAs" community: - level_editor: "Редактор рівнів" main_title: "Спільноти CodeCombat" - facebook: "Facebook" - twitter: "Twitter" - gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" editor: main_title: "Редактори CodeCombat" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "українська мова", englishDesc level_search_title: "Шукати рівні тут" # achievement_search_title: "Search Achievements" read_only_warning2: "Примітка: Ви не можете зберегти ніякі зміни, оскільки Ви не зареєструвались." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" article: edit_btn_preview: "Анонс" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "українська мова", englishDesc general: and: "та" name: "Ім’я" +# date: "Date" body: "Тіло" version: "Версія" commit_msg: "Доручити повідомлення" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "українська мова", englishDesc nick_description: "Чарівник програмування, ексцентричний маг мотивації та непересічний експериментатор. Нік здатен зробити будь-що, і він обрав зробити CodeCombat." jeremy_description: "Чарівник підтримки користувачів, тестер юзабіліті та організатор спільноти; ви ймовірно вже спілкувались з Джеремі." michael_description: "Програміст, адмін та загадковий технічний вундеркінд, Майкл - та людина, що утримує наші сервери онлайн." - glen_description: "Програміст та натхненний розробник ігор, що мріє зробити цей світ краще, створюючи дійсно значущі речі. Ніколи не вживає слова \"неможливо\". Дізнаватися нове - для нього найбільша насолода!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." legal: page_title: "Юридична інформація" @@ -938,3 +953,38 @@ module.exports = nativeDescription: "українська мова", englishDesc # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/ur.coffee b/app/locale/ur.coffee index 85ea79946..c2274a5a9 100644 --- a/app/locale/ur.coffee +++ b/app/locale/ur.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu", # blog: "Blog" # forum: "Forum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" # admin: "Admin" # home: "Home" # contribute: "Contribute" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu", # new_password: "New Password" # new_password_verify: "Verify" # email_subscriptions: "Email Subscriptions" +# email_subscriptions_none: "No Email Subscriptions." # email_announcements: "Announcements" # email_announcements_description: "Get emails on the latest news and developments at CodeCombat." # email_notifications: "Notifications" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." # contributor_emails: "Contributor Class Emails" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu", # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu", # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu", # general: # and: "and" # name: "Name" +# date: "Date" # body: "Body" # version: "Version" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu", # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu", # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu", # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/vi.coffee b/app/locale/vi.coffee index 4eaea50b8..7ee8be6d0 100644 --- a/app/locale/vi.coffee +++ b/app/locale/vi.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn # blog: "Blog" forum: "Diễn đàn" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "Quản trị viên" home: "Nhà" contribute: "Contribute" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn new_password: "Mật khẩu mới" new_password_verify: "Xác nhận" email_subscriptions: "Thuê bao Email" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "Thông báo" email_announcements_description: "Nhận email về tin tức mới nhất và sự phát triển của Codecombat." # email_notifications: "Notifications" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." # contributor_emails: "Contributor Class Emails" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn # general: # and: "and" # name: "Name" +# date: "Date" # body: "Body" # version: "Version" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/zh-HANS.coffee b/app/locale/zh-HANS.coffee index 0a8724a75..b1c10912e 100644 --- a/app/locale/zh-HANS.coffee +++ b/app/locale/zh-HANS.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese blog: "博客" forum: "论坛" account: "账号" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "管理" home: "首页" contribute: "贡献" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese new_password: "新密码" new_password_verify: "核实" email_subscriptions: "邮箱验证" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "通知" email_announcements_description: "接收关于 CodeCombat 的邮件。" email_notifications: "通知" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." email_any_notes: "任何通知" email_any_notes_description: "取消接收所有活动提醒邮件" +# email_news: "News" email_recruit_notes: "工作机会" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." contributor_emails: "贡献者通知" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese # clas: "CLAs" community: - level_editor: "关卡编辑器" main_title: "CodeCombat 社区" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" editor: main_title: "CodeCombat 编辑器" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese level_search_title: "在这里搜索关卡" # achievement_search_title: "Search Achievements" read_only_warning2: "提示：你不能保存任何编辑，因为你没有登陆" +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" article: edit_btn_preview: "预览" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese general: and: "和" name: "名字" +# date: "Date" body: "正文" version: "版本" commit_msg: "提交信息" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." legal: page_title: "法律" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese introduction_desc_github_url: "我们把 CodeCombat 完全开源" introduction_desc_suf: "，而且我们希望提供尽可能多的方法让你来参加这个项目，与我们一起创造。" introduction_desc_ending: "我们希望你也能一起加入进来！" - introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy 以及 Glen" + introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy 以及 Matt" alert_account_message_intro: "你好！" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." archmage_summary: "你对游戏图像、界面设计、数据库和服务器运营、多人在线、物理、声音、游戏引擎性能感兴趣吗？想做一个教别人编程的游戏吗？如果你有编程经验，想要开发 CodeCombat ，那就选择这个职业吧。我们会非常高兴在制作史上最棒编程游戏的过程中得到你的帮助。" @@ -938,3 +953,38 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/zh-HANT.coffee b/app/locale/zh-HANT.coffee index b5ede37c4..028d5f123 100644 --- a/app/locale/zh-HANT.coffee +++ b/app/locale/zh-HANT.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese blog: "官方部落格" forum: "論壇" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "系統管理員" home: "首頁" contribute: "貢獻" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese new_password: "新密碼" new_password_verify: "確認密碼" email_subscriptions: "訂閱" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "通知" email_announcements_description: "接收關於 CodeCombat 的新聞和開發消息。" # email_notifications: "Notifications" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." contributor_emails: "貢獻者電郵" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese general: # and: "and" name: "名字" +# date: "Date" # body: "Body" # version: "Version" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/zh-WUU-HANS.coffee b/app/locale/zh-WUU-HANS.coffee index 227ba698f..10dea5d73 100644 --- a/app/locale/zh-WUU-HANS.coffee +++ b/app/locale/zh-WUU-HANS.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi # blog: "Blog" # forum: "Forum" # account: "Account" +# profile: "Profile" +# stats: "Stats" +# code: "Code" # admin: "Admin" # home: "Home" # contribute: "Contribute" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi # new_password: "New Password" # new_password_verify: "Verify" # email_subscriptions: "Email Subscriptions" +# email_subscriptions_none: "No Email Subscriptions." # email_announcements: "Announcements" # email_announcements_description: "Get emails on the latest news and developments at CodeCombat." # email_notifications: "Notifications" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." # contributor_emails: "Contributor Class Emails" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi # general: # and: "and" # name: "Name" +# date: "Date" # body: "Body" # version: "Version" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/zh-WUU-HANT.coffee b/app/locale/zh-WUU-HANT.coffee index 8d097a8e7..fcaf99542 100644 --- a/app/locale/zh-WUU-HANT.coffee +++ b/app/locale/zh-WUU-HANT.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio blog: "部落格" forum: "論壇" account: "賬號" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "管理" home: "首頁" contribute: "貢獻" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio new_password: "新密碼" new_password_verify: "覈實" email_subscriptions: "郵箱校對" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "通知" email_announcements_description: "收 有關 CodeCombat 個電子信。" email_notifications: "通知" # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_any_notes: "Any Notifications" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" # email_recruit_notes: "Job Opportunities" # email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job." contributor_emails: "貢獻人個通知" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" editor: main_title: "CodeCombat 編寫器" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio level_search_title: "徠箇搭尋關" # achievement_search_title: "Search Achievements" read_only_warning2: "提醒：爾嘸處存編寫，朆登進之故" +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" article: edit_btn_preview: "試望" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio general: and: "搭" name: "名字" +# date: "Date" body: "正文" version: "版本" commit_msg: "提交訊息" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." legal: page_title: "律法" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio introduction_desc_github_url: "我裏畀 CodeCombat 整個開源" introduction_desc_suf: "，我裏也希望提供越多越好個方法讓爾參加箇項目，搭我裏聚隊造。" introduction_desc_ending: "我裏希望爾也聚隊加進來！" - introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy 搭 Glen" + introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy 搭 Matt" alert_account_message_intro: "爾好！" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." archmage_summary: "爾對遊戲圖像、界面設計、數據庫搭服務器運行、多人徠線、物理、聲音、遊戲引擎性能許感興趣噃？想做一個教別人編程個遊戲噃？空是爾有編程經驗，想開發 CodeCombat ，箇勿職業揀箇去。我裏候快活個，徠造“史上最讚個編程遊戲”個過程當中有爾個幫襯。" @@ -938,3 +953,38 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/locale/zh.coffee b/app/locale/zh.coffee index a3c3d7f77..18fffb6ba 100644 --- a/app/locale/zh.coffee +++ b/app/locale/zh.coffee @@ -49,6 +49,9 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra blog: "博客" forum: "论坛" account: "账号" +# profile: "Profile" +# stats: "Stats" +# code: "Code" admin: "超级管理员" home: "首页" contribute: "贡献" @@ -176,12 +179,14 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra new_password: "新密码" new_password_verify: "验证" email_subscriptions: "邮件订阅" +# email_subscriptions_none: "No Email Subscriptions." email_announcements: "声明" email_announcements_description: "获取有关CodeCombat的最新消息" email_notifications: "通知" email_notifications_summary: "控制个性化的自动邮件提醒，提醒您在CodeCombat的活动" email_any_notes: "任何通知" # email_any_notes_description: "Disable to stop all activity notification emails." +# email_news: "News" email_recruit_notes: "工作机会" email_recruit_notes_description: "如果你玩得的确不赖，我们会联系你，或许给你一份（更好的）工作" contributor_emails: "贡献者邮件" @@ -519,11 +524,16 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra # clas: "CLAs" # community: -# level_editor: "Level Editor" # main_title: "CodeCombat Community" -# facebook: "Facebook" -# twitter: "Twitter" -# gplus: "Google+" +# 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!" +# thang_editor_prefix: "We call units within the game 'thangs'. Use the" +# thang_editor_suffix: "to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites." +# article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the" +# article_editor_suffix: "and help CodeCombat players get the most out of their playtime." +# find_us: "Find us on these sites" +# contribute_to_the_project: "Contribute to the project" # editor: # main_title: "CodeCombat Editors" @@ -591,6 +601,10 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra # level_search_title: "Search Levels Here" # achievement_search_title: "Search Achievements" # read_only_warning2: "Note: you can't save any edits here, because you're not logged in." +# no_achievements: "No achievements have been added for this level yet." +# achievement_query_misc: "Key achievement off of miscellanea" +# achievement_query_goals: "Key achievement off of level goals" +# level_completion: "Level Completion" # article: # edit_btn_preview: "Preview" @@ -599,6 +613,7 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra general: # and: "and" name: "名字" +# date: "Date" # body: "Body" # version: "Version" # commit_msg: "Commit Message" @@ -647,7 +662,7 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra # nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat." # jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy." # michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online." -# glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!" +# matt_description: "Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur of peanut butter, sipper of coffee." # legal: # page_title: "Legal" @@ -718,7 +733,7 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra # introduction_desc_github_url: "CodeCombat is totally open source" # introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours." # introduction_desc_ending: "We hope you'll join our party!" -# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Glen" +# introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt" # alert_account_message_intro: "Hey there!" # alert_account_message: "To subscribe for class emails, you'll need to be logged in first." # archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever." @@ -938,3 +953,38 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra # text_diff: "Text Diff" # merge_conflict_with: "MERGE CONFLICT WITH" # no_changes: "No Changes" + +# user: +# stats: "Stats" +# singleplayer_title: "Singleplayer Levels" +# multiplayer_title: "Multiplayer Levels" +# achievements_title: "Achievements" +# last_played: "Last Played" +# status: "Status" +# status_completed: "Completed" +# status_unfinished: "Unfinished" +# no_singleplayer: "No Singleplayer games played yet." +# no_multiplayer: "No Multiplayer games played yet." +# no_achievements: "No Achievements earned yet." +# favorite_prefix: "Favorite language is " +# favorite_postfix: "." + +# achievements: +# last_earned: "Last Earned" +# amount_achieved: "Amount" +# achievement: "Achievement" +# category_contributor: "Contributor" +# category_miscellaneous: "Miscellaneous" +# category_levels: "Levels" +# category_undefined: "Uncategorized" +# current_xp_prefix: "" +# current_xp_postfix: " in total" +# new_xp_prefix: "" +# new_xp_postfix: " earned" +# left_xp_prefix: "" +# left_xp_infix: " until level " +# left_xp_postfix: "" + +# account: +# recently_played: "Recently Played" +# no_recent_games: "No games played during the past two weeks." diff --git a/app/models/Achievement.coffee b/app/models/Achievement.coffee index 88603c6ef..723b2b0bf 100644 --- a/app/models/Achievement.coffee +++ b/app/models/Achievement.coffee @@ -1,5 +1,5 @@ CocoModel = require './CocoModel' -util = require '../lib/utils' +utils = require '../lib/utils' module.exports = class Achievement extends CocoModel @className: 'Achievement' @@ -11,6 +11,47 @@ module.exports = class Achievement extends CocoModel # TODO logic is duplicated in Mongoose Achievement schema getExpFunction: -> - kind = @get('function')?.kind or @schema.function.default.kind - parameters = @get('function')?.parameters or @schema.function.default.parameters + kind = @get('function')?.kind or jsonschema.properties.function.default.kind + parameters = @get('function')?.parameters or jsonschema.properties.function.default.parameters return utils.functionCreators[kind](parameters) if kind of utils.functionCreators + + @styleMapping: + 1: 'achievement-wood' + 2: 'achievement-stone' + 3: 'achievement-silver' + 4: 'achievement-gold' + 5: 'achievement-diamond' + + getStyle: -> Achievement.styleMapping[@get 'difficulty'] + + @defaultImageURL: '/images/achievements/default.png' + + getImageURL: -> + if @get 'icon' then '/file/' + @get('icon') else Achievement.defaultImageURL + + hasImage: -> @get('icon')? + + # TODO Could cache the default icon separately + cacheLockedImage: -> + return @lockedImageURL if @lockedImageURL + canvas = document.createElement 'canvas' + image = new Image + image.src = @getImageURL() + defer = $.Deferred() + image.onload = => + canvas.width = image.width + canvas.height = image.height + context = canvas.getContext '2d' + context.drawImage image, 0, 0 + imgData = context.getImageData 0, 0, canvas.width, canvas.height + imgData = utils.grayscale imgData + context.putImageData imgData, 0, 0 + @lockedImageURL = canvas.toDataURL() + defer.resolve @lockedImageURL + defer + + getLockedImageURL: -> @lockedImageURL + + i18nName: -> utils.i18n @attributes, 'name' + + i18nDescription: -> utils.i18n @attributes, 'description' diff --git a/app/models/CocoModel.coffee b/app/models/CocoModel.coffee index 5da19cab3..de02d9f1d 100644 --- a/app/models/CocoModel.coffee +++ b/app/models/CocoModel.coffee @@ -1,8 +1,6 @@ storage = require 'lib/storage' deltasLib = require 'lib/deltas' -NewAchievementCollection = require '../collections/NewAchievementCollection' - class CocoModel extends Backbone.Model idAttribute: '_id' loaded: false @@ -220,6 +218,9 @@ class CocoModel extends Backbone.Model catch error console.error 'Error applying delta\n', JSON.stringify(delta, null, '\t'), '\n\nto attributes\n\n', newAttributes return false + for key, value of newAttributes + delete newAttributes[key] if _.isEqual value, @attributes[key] + @set newAttributes return true @@ -298,11 +299,13 @@ class CocoModel extends Backbone.Model return if _.isString @url then @url else @url() @pollAchievements: -> + NewAchievementCollection = require '../collections/NewAchievementCollection' # Nasty mutual inclusion if put on top achievements = new NewAchievementCollection - achievements.fetch( + achievements.fetch success: (collection) -> me.fetch (success: -> Backbone.Mediator.publish('achievements:new', collection)) unless _.isEmpty(collection.models) - ) + error: -> + console.error 'Miserably failed to fetch unnotified achievements', arguments CocoModel.pollAchievements = _.debounce CocoModel.pollAchievements, 500 diff --git a/app/models/EarnedAchievement.coffee b/app/models/EarnedAchievement.coffee new file mode 100644 index 000000000..2fa36037c --- /dev/null +++ b/app/models/EarnedAchievement.coffee @@ -0,0 +1,7 @@ +CocoModel = require './CocoModel' +utils = require '../lib/utils' + +module.exports = class EarnedAchievement extends CocoModel + @className: 'EarnedAchievement' + @schema: require 'schemas/models/earned_achievement' + urlRoot: '/db/earnedachievement' diff --git a/app/models/Level.coffee b/app/models/Level.coffee index 4d1aebc5d..d2972366b 100644 --- a/app/models/Level.coffee +++ b/app/models/Level.coffee @@ -22,7 +22,11 @@ module.exports = class Level extends CocoModel o.systems = @sortSystems o.systems, systemModels @fillInDefaultSystemConfiguration o.systems - o.thangTypes = (original: tt.get('original'), name: tt.get('name'), components: tt.get('components') for tt in supermodel.getModels ThangType) + # Figure out ThangTypes' Components + o.thangTypes = (original: tt.get('original'), name: tt.get('name'), components: $.extend(true, [], tt.get('components')) for tt in supermodel.getModels ThangType) + @sortThangComponents o.thangTypes, o.levelComponents + @fillInDefaultComponentConfiguration o.thangTypes, o.levelComponents + o denormalize: (supermodel) -> @@ -76,14 +80,15 @@ module.exports = class Level extends CocoModel visit = (c) -> return if c in sorted lc = _.find levelComponents, {original: c.original} - console.error thang.id, 'couldn\'t find lc for', c unless lc + console.error thang.id or thang.name, 'couldn\'t find lc for', c, 'of', levelComponents unless lc + return unless lc if lc.name is 'Programmable' # Programmable always comes last visit c2 for c2 in _.without thang.components, c else for d in lc.dependencies or [] c2 = _.find thang.components, {original: d.original} - console.error thang.id, 'couldn\'t find dependent Component', d.original, 'from', lc.name unless c2 + console.error thang.id or thang.name, 'couldn\'t find dependent Component', d.original, 'from', lc.name unless c2 visit c2 if c2 if lc.name is 'Collides' allied = _.find levelComponents, {name: 'Allied'} diff --git a/app/models/LevelComponent.coffee b/app/models/LevelComponent.coffee index 4ab97c9c5..6353e9684 100644 --- a/app/models/LevelComponent.coffee +++ b/app/models/LevelComponent.coffee @@ -5,6 +5,8 @@ module.exports = class LevelComponent extends CocoModel @schema: require 'schemas/models/level_component' @EquipsID: '53e217d253457600003e3ebb' + @ItemID: '53e12043b82921000051cdf9' + @AttacksID: '524b7ba57fc0f6d519000016' urlRoot: '/db/level.component' set: (key, val, options) -> diff --git a/app/models/LevelSession.coffee b/app/models/LevelSession.coffee index b98cac66e..34b03be6d 100644 --- a/app/models/LevelSession.coffee +++ b/app/models/LevelSession.coffee @@ -36,3 +36,9 @@ module.exports = class LevelSession extends CocoModel spell = item[1] return true if c1[thang][spell] isnt c2[thang]?[spell] false + + isMultiplayer: -> + @get('team')? # Only multiplayer level sessions have teams defined + + completed: -> + @get('state')?.complete || false diff --git a/app/models/SuperModel.coffee b/app/models/SuperModel.coffee index 24f9b3e04..cd7db688b 100644 --- a/app/models/SuperModel.coffee +++ b/app/models/SuperModel.coffee @@ -58,9 +58,15 @@ module.exports = class SuperModel extends Backbone.Model return res else @addCollection collection - @listenToOnce collection, 'sync', (c) -> - console.debug 'Registering collection', url - @registerCollection c + onCollectionSynced = (c) -> + if collection.url is c.url + console.debug 'Registering collection', url, c + @registerCollection c + else + console.warn 'Sync triggered for collection', c + console.warn 'Yet got other object', c + @listenToOnce collection, 'sync', onCollectionSynced + @listenToOnce collection, 'sync', onCollectionSynced res = @addModelResource(collection, name, fetchOptions, value) res.load() if not (res.isLoading or res.isLoaded) return res diff --git a/app/models/ThangType.coffee b/app/models/ThangType.coffee index 76bffd5a0..d35f4c0b8 100644 --- a/app/models/ThangType.coffee +++ b/app/models/ThangType.coffee @@ -1,5 +1,6 @@ CocoModel = require './CocoModel' SpriteBuilder = require 'lib/sprites/SpriteBuilder' +LevelComponent = require './LevelComponent' buildQueue = [] @@ -262,3 +263,55 @@ module.exports = class ThangType extends CocoModel @wizardType.url = -> url @wizardType.fetch() @wizardType + + getPortraitURL: -> "/file/db/thang.type/#{@get('original')}/portrait.png" + + # Item functions + + getAllowedSlots: -> + itemComponentRef = _.find( + @get('components') or [], + (compRef) -> compRef.original is LevelComponent.ItemID) + return itemComponentRef?.config?.slots or [] + + getFrontFacingStats: -> + stats = [] + for component in @get('components') or [] + continue unless config = component.config + if config.attackDamage + stats.push { name: 'Attack Damage', value: config.attackDamage } + if config.attackRange + stats.push { name: 'Attack Range', value: "#{config.attackRange}m" } + if config.cooldown + stats.push { name: 'Cooldown', value: "#{config.cooldown}s" } + if config.maxSpeed + stats.push { name: 'Speed', value: "#{config.maxSpeed}m/s" } + if config.maxAcceleration + stats.push { name: 'Acceleration', value: "#{config.maxAcceleration}m/s^2" } + if config.stats + for stat, value of config.stats + if value.factor + value = "x#{value.factor}" + if value.addend and value.addend > 0 + value = "+#{value.addend}" + if value.addend and value.addend < 0 + value = "#{value.addend}" + if value.setTo + value = "=#{value.setTo}" + if stat is 'maxHealth' + stats.push { name: 'Health', value: value } + if stat is 'healthReplenishRate' + stats.push { name: 'Regen', value: value } + if config.programmableProperties + props = config.programmableProperties + if props.length + stats.push { name: 'Allows', value: props.join(', ') } + if config.visualRange + value = config.visualRange + if value is 9001 then value is "Infinite" + stats.push { name: 'Visual Range', value: "#{value}m"} + if config.programmableSnippets + snippets = config.programmableSnippets + if snippets.length + stats.push { name: 'Snippets', value: snippets.join(', ') } + stats \ No newline at end of file diff --git a/app/models/User.coffee b/app/models/User.coffee index 91cc40e49..7b492cdba 100644 --- a/app/models/User.coffee +++ b/app/models/User.coffee @@ -9,14 +9,24 @@ module.exports = class User extends CocoModel urlRoot: '/db/user' notyErrors: false + defaults: + points: 0 + initialize: -> super() @migrateEmails() + onLoaded: -> + CocoModel.pollAchievements() # Check for achievements on login + super arguments... + isAdmin: -> permissions = @attributes['permissions'] or [] return 'admin' in permissions + isAnonymous: -> + @get 'anonymous' + displayName: -> @get('name') or 'Anoner' @@ -32,47 +42,13 @@ module.exports = class User extends CocoModel return "/file/#{photoURL}#{prefix}s=#{size}" return "/db/user/#{@id}/avatar?s=#{size}&employerPageAvatar=#{useEmployerPageAvatar}" - @getByID = (id, properties, force) -> - {me} = require 'lib/auth' - return me if me.id is id - user = cache[id] or new module.exports({_id: id}) - if force or not cache[id] - user.loading = true - user.fetch( - success: -> - user.loading = false - Backbone.Mediator.publish('user:fetched') - #user.trigger 'sync' # needed? - ) - cache[id] = user - user + getSlugOrID: -> @get('slug') or @get('_id') + set: -> if arguments[0] is 'jobProfileApproved' and @get("jobProfileApproved") is false and not @get("jobProfileApprovedDate") @set "jobProfileApprovedDate", (new Date()).toISOString() super arguments... - # callbacks can be either success or error - @getByIDOrSlug: (idOrSlug, force, callbacks={}) -> - {me} = require 'lib/auth' - isID = util.isID idOrSlug - if me.id is idOrSlug or me.slug is idOrSlug - callbacks.success me if callbacks.success? - return me - cached = cache[idOrSlug] - user = cached or new @ _id: idOrSlug - if force or not cached - user.loading = true - user.fetch - success: -> - user.loading = false - Backbone.Mediator.publish 'user:fetched' - callbacks.success user if callbacks.success? - error: -> - user.loading = false - callbacks.error user if callbacks.error? - cache[idOrSlug] = user - user - @getUnconflictedName: (name, done) -> $.ajax "/auth/name/#{name}", success: (data) -> done data.name @@ -111,19 +87,16 @@ module.exports = class User extends CocoModel isEmailSubscriptionEnabled: (name) -> (@get('emails') or {})[name]?.enabled a = 5 - b = 40 + b = 100 + c = b - # y = a * ln(1/b * (x + b)) + 1 + # y = a * ln(1/b * (x + c)) + 1 @levelFromExp: (xp) -> - if xp > 0 then Math.floor(a * Math.log((1/b) * (xp + b))) + 1 else 1 + if xp > 0 then Math.floor(a * Math.log((1/b) * (xp + c))) + 1 else 1 - # x = (e^((y-1)/a) - 1) * b + # x = b * e^((y-1)/a) - c @expForLevel: (level) -> - Math.ceil((Math.exp((level - 1)/ a) - 1) * b) + if level > 1 then Math.ceil Math.exp((level - 1)/ a) * b - c else 0 level: -> User.levelFromExp(@get('points')) - - levelFromExp: (xp) -> User.levelFromExp(xp) - - expForLevel: (level) -> User.expForLevel(level) diff --git a/app/schemas/models/achievement.coffee b/app/schemas/models/achievement.coffee index 196c81974..473e53cc8 100644 --- a/app/schemas/models/achievement.coffee +++ b/app/schemas/models/achievement.coffee @@ -24,8 +24,9 @@ MongoFindQuerySchema = '^[-a-zA-Z0-9\.]*$': oneOf: [ #{$ref: '#/definitions/' + MongoQueryOperatorSchema.id}, - {type: 'string'}, + {type: 'string'} {type: 'object'} + {type: 'boolean'} ] additionalProperties: true # TODO make Treema accept new pattern matched keys definitions: {} @@ -34,36 +35,58 @@ MongoFindQuerySchema.definitions[MongoQueryOperatorSchema.id] = MongoQueryOperat AchievementSchema = c.object() c.extendNamedProperties AchievementSchema -c.extendBasicProperties AchievementSchema, 'article' +c.extendBasicProperties AchievementSchema, 'achievement' c.extendSearchableProperties AchievementSchema -_.extend(AchievementSchema.properties, +_.extend AchievementSchema.properties, query: #type:'object' $ref: '#/definitions/' + MongoFindQuerySchema.id - worth: {type: 'number'} + worth: c.float + default: 10 collection: {type: 'string'} - description: {type: 'string'} - userField: {type: 'string'} + description: c.shortString + default: 'Probably the coolest you\'ll ever get.' + userField: c.shortString() related: c.objectId(description: 'Related entity') icon: {type: 'string', format: 'image-file', title: 'Icon'} + category: + enum: ['level', 'ladder', 'contributor'] + description: 'For categorizing and display purposes' + difficulty: c.int + description: 'The higher the more difficult' + default: 1 proportionalTo: type: 'string' description: 'For repeatables only. Denotes the field a repeatable achievement needs for its calculations' + recalculable: + type: 'boolean' + description: 'Needs to be set to true before it is elligible for recalculation.' + default: true function: type: 'object' + description: 'Function that gives total experience for X amount achieved' properties: - kind: {enum: ['linear', 'logarithmic'], default: 'linear'} + kind: {enum: ['linear', 'logarithmic', 'quadratic'], default: 'linear'} parameters: type: 'object' properties: a: {type: 'number', default: 1} b: {type: 'number', default: 1} c: {type: 'number', default: 1} + additionalProperties: true default: {kind: 'linear', parameters: a: 1} required: ['kind', 'parameters'] additionalProperties: false -) + i18n: c.object + format: 'i18n' + props: ['name', 'description'] + description: 'Help translate this achievement' + +_.extend AchievementSchema, # Let's have these on the bottom + # TODO We really need some required properties in my opinion but this makes creating new achievements impossible as it is now + #required: ['name', 'description', 'query', 'worth', 'collection', 'userField', 'category', 'difficulty'] + additionalProperties: false AchievementSchema.definitions = {} AchievementSchema.definitions[MongoFindQuerySchema.id] = MongoFindQuerySchema diff --git a/app/schemas/models/level_session.coffee b/app/schemas/models/level_session.coffee index 284d98fc0..575937993 100644 --- a/app/schemas/models/level_session.coffee +++ b/app/schemas/models/level_session.coffee @@ -101,6 +101,14 @@ _.extend LevelSessionSchema.properties, type: 'object' source: type: 'string' + goalStates: + type: 'object' + description: 'Maps Goal ID on a goal state object' + additionalProperties: + title: 'Goal State' + type: 'object' + properties: + status: enum: ['failure', 'incomplete', 'success'] code: type: 'object' diff --git a/app/schemas/models/patch.coffee b/app/schemas/models/patch.coffee index 6af348725..bd4e822fe 100644 --- a/app/schemas/models/patch.coffee +++ b/app/schemas/models/patch.coffee @@ -20,6 +20,9 @@ PatchSchema = c.object({title: 'Patch', required: ['target', 'delta', 'commitMes major: {type: 'number', minimum: 0} minor: {type: 'number', minimum: 0} }) + + wasPending: type: 'boolean' + newlyAccepted: type: 'boolean' }) c.extendBasicProperties(PatchSchema, 'patch') diff --git a/app/schemas/models/user.coffee b/app/schemas/models/user.coffee index 47a164b5c..be4478820 100644 --- a/app/schemas/models/user.coffee +++ b/app/schemas/models/user.coffee @@ -222,6 +222,33 @@ _.extend UserSchema.properties, points: {type: 'number'} activity: {type: 'object', description: 'Summary statistics about user activity', additionalProperties: c.activity} + stats: c.object {additionalProperties: false}, + gamesCompleted: c.int() + articleEdits: c.int() + levelEdits: c.int() + levelSystemEdits: c.int() + levelComponentEdits: c.int() + thangTypeEdits: c.int() + patchesSubmitted: c.int + description: 'Amount of patches submitted, not necessarily accepted' + patchesContributed: c.int + description: 'Amount of patches submitted and accepted' + patchesAccepted: c.int + description: 'Amount of patches accepted by the user as owner' + # The below patches only apply to those that actually got accepted + totalTranslationPatches: c.int() + totalMiscPatches: c.int() + articleTranslationPatches: c.int() + articleMiscPatches: c.int() + levelTranslationPatches: c.int() + levelMiscPatches: c.int() + levelComponentTranslationPatches: c.int() + levelComponentMiscPatches: c.int() + levelSystemTranslationPatches: c.int() + levelSystemMiscPatches: c.int() + thangTypeTranslationPatches: c.int() + thangTypeMiscPatches: c.int() + c.extendBasicProperties UserSchema, 'user' diff --git a/app/schemas/schemas.coffee b/app/schemas/schemas.coffee index 65045a2e7..ea6881729 100644 --- a/app/schemas/schemas.coffee +++ b/app/schemas/schemas.coffee @@ -19,6 +19,8 @@ me.date = (ext) -> combine({type: ['object', 'string'], format: 'date-time'}, ex # should just be string (Mongo ID), but sometimes mongoose turns them into objects representing those, so we are lenient me.objectId = (ext) -> schema = combine({type: ['object', 'string']}, ext) me.url = (ext) -> combine({type: 'string', format: 'url', pattern: urlPattern}, ext) +me.int = (ext) -> combine {type: 'integer'}, ext +me.float = (ext) -> combine {type: 'number'}, ext PointSchema = me.object {title: 'Point', description: 'An {x, y} coordinate point.', format: 'point2d', required: ['x', 'y']}, x: {title: 'x', description: 'The x coordinate.', type: 'number', 'default': 15} diff --git a/app/styles/account/account_home.sass b/app/styles/account/account_home.sass new file mode 100644 index 000000000..800c8a8b2 --- /dev/null +++ b/app/styles/account/account_home.sass @@ -0,0 +1,32 @@ +@import "../bootstrap/variables" +@import "../bootstrap/mixins" + +#account-home + dl + margin-bottom: 0px + + img#picture + max-width: 100% + + .panel + margin-bottom: 10px + + h2 + margin-bottom: 0px + + a + font-size: 28px + margin-left: 5px + + .panel-title > a + margin-left: 5px + color: rgb(11, 99, 188) + + .panel-me + td + padding-left: 15px + + .panel-emails + h4 + font-family: $font-family-base + diff --git a/app/styles/achievements.sass b/app/styles/achievements.sass new file mode 100644 index 000000000..39a277aa4 --- /dev/null +++ b/app/styles/achievements.sass @@ -0,0 +1,243 @@ +@import 'bootstrap/variables' + +.achievement-body + position: relative + + .achievement-icon + position: absolute + + .achievement-image + width: 100% + height: 100% + img + position: absolute + margin: auto + top: 0 + left: 0 + right: 0 + bottom: 0 + + &.locked + .achievement-content + background-image: url("/images/achievements/achievement_background_locked.png") + &:not(.locked) + .achievement-content + background-image: url("/images/achievements/achievement_background_light.png") + + .achievement-content + background-size: 100% 100% + text-align: center + overflow: hidden + + > .achievement-title + font-family: $font-family-base + font-weight: bold + white-space: nowrap + max-height: 2em + overflow: hidden + text-overflow: ellipsis + + + > .achievement-description + white-space: initial + font-size: 12px + line-height: 1.3em + max-height: 2.6em + margin-top: auto + margin-bottom: 0px !important + padding-left: 5px + overflow: hidden + text-overflow: ellipsis + +// Specific to the user stats page +#user-achievements-view + .achievement-body + width: 335px + height: 120px + margin: 10px 0px + + .achievement-icon + width: 120px + height: 120px + top: -10px + + .achievement-image + img + -moz-transform: scale(0.6) + -webkit-transform: scale(0.6) + transform: scale(0.6) + + .achievement-content + margin-left: 60px + margin-right: 5px + width: 260px + height: 100px + padding: 15px 10px 20px 60px + + .achievement-title + font-size: 20px + + .achievement-description + font-size: 12px + line-height: 1.3em + max-height: 2.6em + +.achievement-popup + padding: 20px 0px + position: relative + + .achievement-body + .achievement-icon + z-index: 1000 + width: 200px + height: 200px + left: -140px + top: -20px + + .achievement-image + img + position: absolute + margin: auto + top: 0 + left: 0 + right: 0 + bottom: 0 + + .achievement-content + background-image: url("/images/achievements/achievement_background.png") + position: relative + width: 450px + height: 160px + padding: 24px 30px 20px 60px + + .achievement-title + font-family: Bangers + font-size: 28px + padding-left: -50px + + .achievement-description + font-size: 15px + line-height: 1.3em + max-height: 2.6em + margin-top: auto + margin-bottom: 0px !important + + .progress-wrapper + margin-left: 20px + position: absolute + bottom: 48px + + .user-level + font-size: 20px + color: white + position: absolute + left: -15px + margin-top: -8px + vertical-align: middle + z-index: 1000 + + > .progress-bar-wrapper + position: absolute + margin-left: 17px + width: 314px + height: 20px + z-index: 2 + + > .progress + margin-top: 5px + border-radius: 50px + height: 14px + + > .progress-bar-border + position: absolute + width: 340px + height: 30px + margin-top: -2px + background: url("/images/achievements/bar_border.png") no-repeat + background-size: 100% 100% + z-index: 1 + +.achievement-icon + background-size: 100% 100% !important + +.achievement-wood + &.locked + .achievement-icon + background: url("/images/achievements/border_wood_locked.png") no-repeat + &:not(.locked) + .achievement-icon + background: url("/images/achievements/border_wood.png") no-repeat + +.achievement-stone + &.locked + .achievement-icon + background: url("/images/achievements/border_stone_locked.png") no-repeat + &:not(.locked) + .achievement-icon + background: url("/images/achievements/border_stone.png") no-repeat + +.achievement-silver + &.locked + .achievement-icon + background: url("/images/achievements/border_silver_locked.png") no-repeat + &:not(.locked) + .achievement-icon + background: url("/images/achievements/border_silver.png") no-repeat + +.achievement-gold + &.locked + .achievement-icon + background: url("/images/achievements/border_gold_locked.png") no-repeat + &:not(.locked) + .achievement-icon + background: url("/images/achievements/border_gold.png") no-repeat + +.achievement-diamond + &.locked + .achievement-icon + background: url("/images/achievements/border_diamond_locked.png") no-repeat + &:not(.locked) + .achievement-icon + background: url("/images/achievements/border_diamond.png") no-repeat + +.xp-bar-old + background-color: #680080 + +.xp-bar-new + background-color: #0096ff + +.xp-bar-left + background-color: #fffbfd + +// Achievements page +.achievement-category-title + margin-left: 20px + font-family: $font-family-base + font-weight: bold + color: #5a5a5a + text-transform: uppercase + +.table-layout + #no-achievements + margin-top: 40px + +.achievement-icon-small + height: 18px + +// Achievement Popup +.achievement-popup-container + position: fixed + right: 0px + bottom: 0px + +.popup + cursor: default + left: 600px + +.user-level + background-image: url("/images/achievements/level-bg.png") + width: 38px + height: 38px + line-height: 38px + font-size: 20px + font-family: $font-family-base diff --git a/app/styles/base.sass b/app/styles/base.sass index c873d3d0f..332aaa624 100644 --- a/app/styles/base.sass +++ b/app/styles/base.sass @@ -21,7 +21,8 @@ h1 h2 h3 h4 margin: 56px auto 0 min-height: 600px padding: 14px 12px 5px 12px - @include box-sizing(border-box) + +box-sizing(border-box) + +clearfix() #outer-content-wrapper background: #B4B4B4 @@ -116,6 +117,10 @@ a .background-wrapper.plain background: white + + .plain + h1, h2, h3, h4, h5, h6 + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif !important .modal-content @include box-shadow(none) @@ -287,3 +292,9 @@ body[lang='ja'] a[data-toggle="coco-modal"] cursor: pointer + +.achievement-corner + position: fixed + bottom: 0px + right: 0px + z-index: 1001 diff --git a/app/styles/common/top_nav.sass b/app/styles/common/top_nav.sass index 3619a3f9b..42e7fce47 100644 --- a/app/styles/common/top_nav.sass +++ b/app/styles/common/top_nav.sass @@ -1,4 +1,44 @@ @import "../bootstrap/variables" +@import "../bootstrap/mixins" + +// This is still very blocky. Browser reflows? Investigate why. +.open > .dropdown-menu + animation-name: fadeAnimation + animation-duration: .7s + animation-iteration-count: 1 + animation-timing-function: ease + animation-fill-mode: forwards + -webkit-animation-name: fadeAnimation + -webkit-animation-duration: .7s + -webkit-animation-iteration-count: 1 + -webkit-animation-timing-function: ease + -webkit-animation-fill-mode: backwards + -moz-animation-name: fadeAnimation + -moz-animation-duration: .7s + -moz-animation-iteration-count: 1 + -moz-animation-timing-function: ease + -moz-animation-fill-mode: forwards + +@keyframes fadeAnimation + from + opacity: 0 + top: 120% + to + opacity: 1 + top: 100% + +@-webkit-keyframes fadeAnimation + from + opacity: 0 + top: 120% + to + opacity: 1 + top: 100% + +a.disabled + color: #5b5855 + text-decoration: none + cursor: default #top-nav a.navbar-brand @@ -19,11 +59,65 @@ .account-settings-image width: 18px height: 18px + margin-right: 5px .glyphicon-user font-size: 16px + margin-right: 5px - .nav.navbar-link-text, .nav.navbar-link-text > li > a + .dropdown + .dropdown-menu + left: auto + width: 280px + padding: 0px + border-radius: 0px + font-family: Bangers + + > .user-dropdown-header + position: relative + background: #E4CF8C + height: 160px + padding: 10px + text-align: center + color: black + border-bottom: #32281e 1px solid + > a:hover + background-color: transparent + img + border: #e3be7a 8px solid + height: 98px // Includes the border + &:hover + box-shadow: 0 0 20px #e3be7a + > h3 + margin-top: 10px + text-shadow: 2px 2px 3px white + color: #31281E + .user-level + position: absolute + top: 73px + right: 86px + color: gold + text-shadow: 1px 1px black, -1px -1px 0 black, 1px -1px 0 black, -1px 1px 0 black + + .user-dropdown-body + color: black + padding: 15px + letter-spacing: 1px + font: 15px 'Helvetica Neue', Helvetica, Arial, sans-serif + +clearfix() + + .user-dropdown-footer + padding: 10px + margin-left: 0px + font-size: 14px + +clearfix() + + .btn-flat + border: #ddd 1px solid + border-radius: 0px + margin: 0px + + .nav.navbar-link-text > li > a font-weight: normal font-size: 25px letter-spacing: 2px @@ -31,7 +125,7 @@ &:hover color: #f8e413 - .navbar-link-text a:hover + .navbar-link-text > li > a:hover background: darken($body-bg, 3%) .btn, .btn-group, .fancy-select @@ -67,9 +161,6 @@ top: 13px max-width: 140px - .nav - margin-bottom: 0 - div.fancy-select text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25) div.trigger diff --git a/app/styles/community.sass b/app/styles/community.sass index 5c32b21ba..ec7f5118e 100644 --- a/app/styles/community.sass +++ b/app/styles/community.sass @@ -1,24 +1,34 @@ +@import "bootstrap/variables" +@import "bootstrap/mixins" + #community-view + + .community-columns + width: 330px + float: left + padding-left: 10px + padding-right: 10px + + .half-width + width: 50% + height: 175px + float: left + + .logo-row + padding-top: 10px + width: 80% + margin: 0 auto + + .logo-row img + height: 50px + margin: 7px + + .lower-titles + text-align: center - .community_columns - width: 330px - float: left - padding-left: 10px - padding-right: 10px - - .half_width - width: 50% - height: 175px - float: left - - .logo_row - padding-top: 10px - width: 80% - margin: 0 auto - - .logo_row img - height: 50px - margin: 7px - - .lower_titles - text-align: center \ No newline at end of file + img + border-radius: 20px + @include transition( (background-color 0.2s linear, box-shadow 0.2s linear) ) + &:hover + background-color: #7abee3 + box-shadow: 0 0 20px #7abee3 diff --git a/app/styles/editor/achievement/edit.sass b/app/styles/editor/achievement/edit.sass index 7177978d3..157353e9a 100644 --- a/app/styles/editor/achievement/edit.sass +++ b/app/styles/editor/achievement/edit.sass @@ -1,4 +1,6 @@ #editor-achievement-edit-view + height: 100% + .treema-root margin: 28px 0px 20px @@ -10,3 +12,9 @@ textarea width: 92% height: 300px + + #achievement-view + min-height: 200px + position: relative + padding-left: 200px + diff --git a/app/styles/editor/component/add-thang-components-modal.sass b/app/styles/editor/component/add-thang-components-modal.sass new file mode 100644 index 000000000..71d22fa51 --- /dev/null +++ b/app/styles/editor/component/add-thang-components-modal.sass @@ -0,0 +1,24 @@ +#add-thang-components-modal + .list-group + max-height: 500px + overflow: scroll + + .item-title + cursor: pointer + .glyphicon-chevron-down + display: none + &.collapsed + .glyphicon-chevron-down + display: inline + .glyphicon-chevron-up + display: none + + + .list-group-item + padding: 5px + + .checkbox, .item-title + overflow: hidden + text-overflow: ellipsis + white-space: nowrap + diff --git a/app/styles/editor/component/thang-component-config-view.sass b/app/styles/editor/component/thang-component-config-view.sass new file mode 100644 index 000000000..e2670469b --- /dev/null +++ b/app/styles/editor/component/thang-component-config-view.sass @@ -0,0 +1,6 @@ +.thang-component-config-view + .panel-body + padding: 0 + .treema-root + border: 0 + padding: 0 5px diff --git a/app/styles/editor/components/thang-components-edit-view.sass b/app/styles/editor/component/thang-components-edit-view.sass similarity index 95% rename from app/styles/editor/components/thang-components-edit-view.sass rename to app/styles/editor/component/thang-components-edit-view.sass index 7179528bc..77b57132d 100644 --- a/app/styles/editor/components/thang-components-edit-view.sass +++ b/app/styles/editor/component/thang-components-edit-view.sass @@ -1,6 +1,6 @@ #thang-components-edit-view position: absolute - top: 40px + top: 0 bottom: 0 left: 0 right: 0 @@ -17,7 +17,7 @@ .treema-dependent > .treema-row background-color: #FFC671 - #extant-components-column + #thang-components-column left: 0 width: 300px diff --git a/app/styles/editor/components/thang-component-config-view.sass b/app/styles/editor/components/thang-component-config-view.sass deleted file mode 100644 index 2a7426e5e..000000000 --- a/app/styles/editor/components/thang-component-config-view.sass +++ /dev/null @@ -1 +0,0 @@ -//.thang-component-config-view diff --git a/app/styles/editor/level/thang/edit.sass b/app/styles/editor/level/thang/level-thang-edit-view.sass similarity index 73% rename from app/styles/editor/level/thang/edit.sass rename to app/styles/editor/level/thang/level-thang-edit-view.sass index 7bd69e66c..8dba34048 100644 --- a/app/styles/editor/level/thang/edit.sass +++ b/app/styles/editor/level/thang/level-thang-edit-view.sass @@ -1,4 +1,4 @@ -#editor-level-thang-edit +#level-thang-edit-view color: black .well @@ -13,3 +13,6 @@ #all-thangs-link float: left cursor: pointer + + #thang-components-edit-view + top: 50px \ No newline at end of file diff --git a/app/styles/editor/related-achievements.sass b/app/styles/editor/related-achievements.sass new file mode 100644 index 000000000..46314ea65 --- /dev/null +++ b/app/styles/editor/related-achievements.sass @@ -0,0 +1,6 @@ +#related-achievements-view + #new-achievement-button + margin-bottom: 10px + + .icon-column + width: 25px diff --git a/app/styles/editor/thang/home.sass b/app/styles/editor/thang/home.sass index 3509c1f27..193ea50d6 100644 --- a/app/styles/editor/thang/home.sass +++ b/app/styles/editor/thang/home.sass @@ -6,4 +6,4 @@ width: 30px td - vertical-align: middle \ No newline at end of file + vertical-align: middle diff --git a/app/styles/editor/thang/thang-type-edit-view.sass b/app/styles/editor/thang/thang-type-edit-view.sass index 6cded5b03..109651a3b 100644 --- a/app/styles/editor/thang/thang-type-edit-view.sass +++ b/app/styles/editor/thang/thang-type-edit-view.sass @@ -19,7 +19,7 @@ left: 5px button margin-left: 5px - input + input[type="file"] display: none .treema-row img @@ -77,6 +77,8 @@ background-color: white border-radius: 4px + .play-with-level-input + margin: 5px #spritesheets diff --git a/app/styles/game-menu/inventory-view.sass b/app/styles/game-menu/inventory-view.sass index 9e6856e2f..3cec60ad8 100644 --- a/app/styles/game-menu/inventory-view.sass +++ b/app/styles/game-menu/inventory-view.sass @@ -1,3 +1,97 @@ +$selected-area-height: 150px + #inventory-view + position: relative + height: 600px + background-color: white + user-select: none + h3 - text-decoration: underline + margin: 0 + + #equipped + padding: 10px + width: 74% + position: absolute + left: 0 + top: 0 + bottom: $selected-area-height + 10 + right: 0 + overflow: scroll + + .item-slot.disabled + opacity: 0.5 + + .panel + text-align: center + width: 31% + margin: 5px 2% 5px 0 + float: left + cursor: pointer + + .panel-heading + padding: 5px + + .panel-info .panel-body + background-color: #e0f0f5 + + .panel-body + height: 50px + padding: 5px + overflow: scroll + font-size: 12px + + #available-equipment + width: 24% + padding: 10px + position: absolute + right: 1% + top: 0 + bottom: $selected-area-height + 10 + overflow: scroll + user-select: none + + h3 + margin-bottom: 5px + + .list-group-item.active + background-color: #e0f0f5 + + .list-group-item.equipped + display: none + + .item-mixin + &.active + background-color: lightblue + .well + padding: 5px + cursor: pointer + + #selected-items + position: absolute + height: $selected-area-height + left: 0 + right: 0 + bottom: 0 + + #selected-equipped-item, #selected-available-item + position: absolute + bottom: 0 + top: 0 + overflow: scroll + padding: 10px + + img + width: 100px + height: 100px + + .item-info + margin-left: 110px + + #selected-equipped-item + left: 0 + width: 48.5% + + #selected-available-item + right: 2% + width: 48.5% diff --git a/app/styles/game-menu/item-view.sass b/app/styles/game-menu/item-view.sass new file mode 100644 index 000000000..259334682 --- /dev/null +++ b/app/styles/game-menu/item-view.sass @@ -0,0 +1,14 @@ +.item-mixin, .item-view + width: 100% + + img + float: left + width: 40px + height: 40px + + .item-info + margin-left: 45px + + ul + margin-top: 5px + padding-left: 20px diff --git a/app/styles/game-menu/options-view.sass b/app/styles/game-menu/options-view.sass index ae9542bff..b796029e6 100644 --- a/app/styles/game-menu/options-view.sass +++ b/app/styles/game-menu/options-view.sass @@ -1,7 +1,7 @@ @import "app/styles/bootstrap/variables" #options-view - .select-group + .select-group, .slider-group display: block min-height: 20px margin-top: 10px @@ -14,6 +14,9 @@ margin-right: 20px margin-bottom: 0 + .slider + width: 200px + .form-group.radio-inline input margin-left: 0px @@ -22,6 +25,7 @@ .radio-inline-parent-label padding-left: 0 + #player-avatar-container position: relative margin: 0px 0px 15px 15px diff --git a/app/styles/notify.sass b/app/styles/notify.sass deleted file mode 100644 index abf50bb70..000000000 --- a/app/styles/notify.sass +++ /dev/null @@ -1,50 +0,0 @@ -.notifyjs-achievement-base - //background: url("/images/pages/base/notify_mockup.png") - background-image: url("/images/pages/base/modal_background.png") - background-size: 100% 100% - width: 500px - height: 200px - padding: 35px 35px 15px 15px - text-align: center - cursor: auto - - .achievement-body - .achievement-image - img - float: left - width: 100px - height: 100px - border-radius: 50% - margin: 20px 30px 20px 30px - -webkit-box-shadow: 0px 0px 36px 0px white - -moz-box-shadow: 0px 0px 36px 0px white - box-shadow: 0px 0px 36px 0px white - - .achievement-title - font-family: Bangers - font-size: 28px - - .achievement-description - margin-top: 10px - font-size: 16px - - .achievement-progress - padding: 15px 0px 0px 0px - - .achievement-message - font-family: Bangers - font-size: 18px - &:empty - display: none - - .progress-wrapper - .progress-bar-wrapper - width: 100% - .earned-exp - padding-left: 5px - font-family: Bangers - font-size: 16px - float: right - -.progress-bar-white - background-color: white diff --git a/app/styles/play/level/hud.sass b/app/styles/play/level/hud.sass index bfcbccba7..1982f8339 100644 --- a/app/styles/play/level/hud.sass +++ b/app/styles/play/level/hud.sass @@ -115,7 +115,7 @@ background-position-x: -1 * $iconSize &.prop-label-icon-target background-position-x: -2 * $iconSize - &.prop-label-icon-inventory + &.prop-label-icon-collectedThangIDs background-position-x: -3 * $iconSize &.prop-label-icon-visualRange background-position-x: -4 * $iconSize diff --git a/app/styles/user/user_home.sass b/app/styles/user/user_home.sass new file mode 100644 index 000000000..ebd67a391 --- /dev/null +++ b/app/styles/user/user_home.sass @@ -0,0 +1,73 @@ +@import "../bootstrap/variables" +@import "../bootstrap/mixins" + +#user-home + margin-top: 20px + + .left-column + +make-sm-column(4) + + .right-column + +make-sm-column(8) + + .profile-wrapper + text-align: center + outline: 1px solid darkgrey + max-width: 100% + +center-block() + + > .picture + width: 100% + background-color: #ffe4bc + border: 4px solid white + + > .profile-info + background: white + + .extra-info + padding-bottom: 3px + &:empty + display: none + + .name + margin: 0px auto + padding: 10px inherit + color: white + text-shadow: 2px 0 0 #000, -2px 0 0 #000, 0 2px 0 #000, 0 -2px 0 #000, 1px 1px #000, -1px -1px 0 #000, 1px -1px 0 #000, -1px 1px 0 #000 + + .profile-menu + padding-left: 0px + width: 100% + > a + border-radius: 0 + border-width: 1px 0px 0px 0px + border-color: darkgrey + &:hover + border-color: #888 + > span + color: #555555 + font-size: 15px + margin-left: 5px + +.contributor-categories + list-style: none + padding: 0px + margin-top: 15px + + > .contributor-category + outline: 1px solid black + margin-bottom: 15px + + > .contributor-image + border: none + width: 100% + border-bottom: 1px solid black + + > .contributor-title + text-align: center + padding: 5px 0px + margin: 0px + background: white + +.vertical-buffer + padding: 10px 0px diff --git a/app/templates/about.jade b/app/templates/about.jade index ab7e09a41..b9ffc3a57 100644 --- a/app/templates/about.jade +++ b/app/templates/about.jade @@ -153,17 +153,15 @@ block content li.row - img(src="/images/pages/about/glen_small.png").img-thumbnail + img(src="/images/pages/contribute/archmage.png").img-thumbnail .col-sm-8 h3 - a(href="http://www.glendc.com/") Glen De Cauwsemaecker + a(href="http://www.mattlott.com/") Matt Lott - p(data-i18n="about.glen_description") - | Programmer and passionate game developer, - | with the motivation to make this world a better place, - | by developing things that mather. The word impossible can't - | be found in his dictionary. Learning new skills is his joy! + p(data-i18n="about.matt_description") + | Bicyclist, Software Engineer, reader of heroic fantasy, connoisseur + | of peanut butter, sipper of coffee. diff --git a/app/templates/account/account_home.jade b/app/templates/account/account_home.jade new file mode 100644 index 000000000..d59a411df --- /dev/null +++ b/app/templates/account/account_home.jade @@ -0,0 +1,141 @@ +extends /templates/base + +block content + if !me.isAnonymous() + .clearfix + .col-sm-6.clearfix + h2 + span(data-i18n="account_settings.title") Account Settings + a.spl(href="/account/settings") + i.glyphicon.glyphicon-cog + hr + .row + .col-xs-6 + .panel.panel-default + .panel-heading + h3.panel-title + i.glyphicon.glyphicon-picture + a(href="account/settings#picture" data-i18n="account_settings.picture_tab") Picture + .panel-body.text-center + img#picture(src="#{me.getPhotoURL(150)}" alt="Picture") + .col-xs-6 + .panel.panel-default + .panel-heading + h3.panel-title + i.glyphicon.glyphicon-user + a(href="account/settings#wizard" data-i18n="account_settings.wizard_tab") Wizard + if (wizardSource) + .panel-body.text-center + img(src="#{wizardSource}") + .panel.panel-default.panel-me + .panel-heading + h3.panel-title + i.glyphicon.glyphicon-user + a(href="account/settings#me" data-i18n="account_settings.me_tab") Me + .panel-body + table + tr + th(data-i18n="general.name") Name + td=me.displayName() + tr + th(data-i18n="general.email") Email + td=me.get('email') + .panel.panel-default.panel-emails + .panel-heading + h3.panel-title + i.glyphicon.glyphicon-envelope + a(href="account/settings#emails" data-i18n="account_settings.emails_tab") Emails + .panel-body + if !hasEmailNotes && !hasEmailNews && !hasGeneralNews + p(data-i18n="account_settings.email_subscriptions_none") No email subscriptions. + if hasGeneralNews + h4(data-i18n="account_settings.email_news") News + ul + li(data-i18n="account_settings.email_announcements") Announcements + if hasEmailNotes + h4(data-i18n="account_settings.email_notifications") Notifications + ul + if subs.anyNotes + li(data-i18n="account_settings.email_any_notes") Any Notifications + if subs.recruitNotes + li(data-i18n="account_settings.email_recruit_notes") Job Opportunities + if hasEmailNews + h4(data-i18n="account_settings.contributor_emails") Contributor Emails + ul + if (subs.archmageNews) + li + span(data-i18n="classes.archmage_title") + | Archmage + span(data-i18n="classes.archmage_title_description") + | (Coder) + if (subs.artisanNews) + li + span.spr(data-i18n="classes.artisan_title") + | Artisan + span(data-i18n="classes.artisan_title_description") + | (Level Builder) + if (subs.adventurerNews) + li + span.spr(data-i18n="classes.adventurer_title") + | Adventurer + span(data-i18n="classes.adventurer_title_description") + | (Level Playtester) + if (subs.scribeNews) + li + span.spr(data-i18n="classes.scribe_title") + | Scribe + span(data-i18n="classes.scribe_title_description") + | (Article Editor) + if (subs.diplomatNews) + li + span.spr(data-i18n="classes.diplomat_title") + | Diplomat + span(data-i18n="classes.diplomat_title_description") + | (Translator) + if (subs.ambassadorNews) + li + span.spr(data-i18n="classes.ambassador_title") + | Ambassador + span(data-i18n="classes.ambassador_title_description") + | (Support) + + .panel.panel-default + .panel-heading + h3.panel-title + i.glyphicon.glyphicon-wrench + a(href="account/settings#password" data-i18n="general.password") Password + .panel.panel-default + .panel-heading + h3.panel-title + i.glyphicon.glyphicon-briefcase + a(href="account/settings#job-profile" data-i18n="account_settings.job_profile") Job Profile + .col-sm-6 + h2(data-i18n="user.recently_played") Recently Played + hr + if !recentlyPlayed + div(data-i18n="common.loading") Loading... + else if recentlyPlayed.length + table.table + tr + th(data-i18n="resources.level") Level + th(data-i18n="user.last_played") Last Played + th(data-i18n="user.status") Status + each session in recentlyPlayed + if session.get('levelName') + tr + td + - var posturl = '' + - if (session.get('team')) posturl = '?team=' + session.get('team') + a(href="/play/level/#{session.get('levelID') + posturl}")= session.get('levelName') + (session.get('team') ? ' (' + session.get('team') + ')' : '') + td= moment(session.get('changed')).fromNow() + if session.get('state').complete === true + td(data-i18n="user.status_completed") Completed + else if ! session.isMultiplayer() + td(data-i18n="user.status_unfinished") Unfinished + else + td + + else + .panel.panel-default + .panel-body + div(data-i18n="account.no_recent_games") No games played during the past two weeks. diff --git a/app/templates/account/profile.jade b/app/templates/account/profile.jade index 37ff7ef85..a178413ce 100644 --- a/app/templates/account/profile.jade +++ b/app/templates/account/profile.jade @@ -7,7 +7,7 @@ block content |Please a.auth-button login | to view this profile. - else + else if user.loaded if allowedToEditJobProfile .profile-control-bar if editing @@ -486,8 +486,9 @@ block content span(data-i18n="account_profile.profile_for_prefix") Profile for span= user.get('name') || "Anonymous Wizard" span(data-i18n="account_profile.profile_for_suffix") - - img.profile-photo(src=user.getPhotoURL(256)) + + if user.loaded + img.profile-photo(src=user.getPhotoURL(256)) p To see a private user profile, you may need to log in. diff --git a/app/templates/achievement_notify.jade b/app/templates/achievement_notify.jade deleted file mode 100644 index f7ce0eb9b..000000000 --- a/app/templates/achievement_notify.jade +++ /dev/null @@ -1,12 +0,0 @@ -div - .clearfix.achievement-body - .achievement-image(data-notify-html="image") - .achievement-content - .achievement-title(data-notify-html="title") - .achievement-description(data-notify-html="description") - - .achievement-progress - .achievement-message(data-notify-html="message") - .progress-wrapper - .earned-exp(data-notify-html="earnedExp") - .progress-bar-wrapper(data-notify-html="progressBar") diff --git a/app/templates/achievements/achievement-popup.jade b/app/templates/achievements/achievement-popup.jade new file mode 100644 index 000000000..f3e53d4dc --- /dev/null +++ b/app/templates/achievements/achievement-popup.jade @@ -0,0 +1,21 @@ +- var addedClass = style + (locked === true ? ' locked' : '') +.clearfix.achievement-body(class=addedClass) + .achievement-icon + .achievement-image + img(src=imgURL) + .achievement-content + .achievement-title= title + p.achievement-description= description + + if popup + .progress-wrapper + span.user-level= level + .progress-bar-wrapper + .progress + - var currentTitle = $.i18n.t('achievements.current_xp_prefix') + currentXP + ' XP' + $.i18n.t('achievements.current_xp_postfix'); + - var newTitle = $.i18n.t('achievements.new_xp_prefix') + newXP + ' XP' + $.i18n.t('achievements.new_xp_postfix'); + - var leftTitle = $.i18n.t('achievements.left_xp_prefix') + newXP + ' XP' + $.i18n.t('achievements.left_xp_infix') + (level+1) + $.i18n.t('achievements.left_xp_postfix'); + .progress-bar.xp-bar-old(style="width:#{oldXPWidth}%" data-toggle="tooltip" data-placement="top" title="#{currentTitle}") + .progress-bar.xp-bar-new(style="width:#{newXPWidth}%" data-toggle="tooltip" title="#{newTitle}") + .progress-bar.xp-bar-left(style="width:#{leftXPWidth}%" data-toggle="tooltip" title="#{leftTitle}") + .progress-bar-border diff --git a/app/templates/base.jade b/app/templates/base.jade index d8bc8996f..a5f9c29bb 100644 --- a/app/templates/base.jade +++ b/app/templates/base.jade @@ -27,26 +27,44 @@ body select.language-dropdown - if me.get('anonymous') === false - button.btn.btn-primary.navbuttontext.header-font#logout-button(data-i18n="login.log_out") Log Out - a.btn.btn-primary.navbuttontext.header-font(href=me.get('jobProfile') ? "/account/profile/#{me.id}" : "/account/settings") - div.navbuttontext-account(data-i18n="nav.account") Account - if me.get('photoURL') - img.account-settings-image(src=me.getPhotoURL(18), alt="") - else - span.glyphicon.glyphicon-user - - else - button.btn.btn-primary.navbuttontext.header-font.auth-button - span(data-i18n="login.log_in") Log In - span.spr.spl / - span(data-i18n="login.sign_up") Create Account - ul(class='navbar-link-text').nav.navbar-nav.pull-right li.play a.header-font(href='/play', data-i18n="nav.play") Levels li a.header-font(href='/community', data-i18n="nav.community") Community + if me.get('anonymous') === false + li.dropdown + button.btn.btn-primary.navbuttontext.header-font.dropdown-toggle(href="#", data-toggle="dropdown") + if me.get('photoURL') + img.account-settings-image(src=me.getPhotoURL(18), alt="") + else + i.glyphicon.glyphicon-user + .navbuttontext-account(data-i18n="nav.account" href="/account") Account + span.caret + ul.dropdown-menu(role="menu") + li.user-dropdown-header + span.user-level= me.level() + a(href="/user/#{me.getSlugOrID()}") + img.img-circle(src="#{me.getPhotoURL()}" alt="") + h3=me.displayName() + li.user-dropdown-body + .col-xs-4.text-center + a(href="/user/#{me.getSlugOrID()}" data-i18n="nav.profile") Profile + .col-xs-4.text-center + a(href="/user/#{me.getSlugOrID()}/stats" data-i18n="nav.stats") Stats + .col-xs-4.text-center + a.disabled(data-i18n="nav.code") Code + li.user-dropdown-footer + .pull-left + a.btn.btn-default.btn-flat(href="/account" data-i18n="nav.account") Account + .pull-right + button#logout-button.btn.btn-default.btn-flat(data-i18n="login.log_out") Log Out + else + li + button.btn.btn-primary.navbuttontext.header-font.auth-button + span(data-i18n="login.log_in") Log In + span.spr.spl / + span(data-i18n="login.sign_up") Create Account block outer_content #outer-content-wrapper(class=showBackground ? 'show-background' : '') @@ -55,6 +73,7 @@ body .main-content-area block content p If this is showing, you dun goofed + .achievement-corner block footer .footer.clearfix diff --git a/app/templates/community.jade b/app/templates/community.jade index 7b0df7b38..66f67f5e7 100644 --- a/app/templates/community.jade +++ b/app/templates/community.jade @@ -4,96 +4,91 @@ block content h1(data-i18n="community.main_title") Community - p Check out the ways you can get involved below, decide what sounds the most fun, and we look forward to working with you! + p(data-i18n="community.introduction") Check out the ways you can get involved below and decide what sounds the most fun. We look forward to working with you! div - .community_columns - + .community-columns a(href="/editor/level") img(src="/images/pages/community/level.png") - h2 - a.spl(href="/editor/level", data-i18n="community.level_editor") - - p Use the CodeCombat - a.spl(href="/editor/level", data-i18n="community.level_editor") - | 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! - - .community_columns + a.spl(href="/editor/level", data-i18n="editor.level_title") + p + span(data-i18n="community.level_editor_prefix") Use the CodeCombat + a.spl.spr(href="/editor/level", data-i18n="editor.level_title") + span(data-i18n="community.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! + .community-columns a(href="/editor/thang") img(src="/images/pages/community/thang.png") - - h2 a.spl(href="/editor/thang", data-i18n="editor.thang_title") + p + span(data-i18n="community.thang_editor_prefix") We call units within the game 'thangs'. Use the + a.spl.spr(href="/editor/thang", data-i18n="editor.thang_title") + span(data-i18n="community.level_editor_suffix") to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own vector sprites. - p We call items within the game "thangs." Use the - a.spl(href="/editor/thang", data-i18n="editor.thang_title") - | to modify the CodeCombat source artwork. Allow units to throw projectiles, alter the direction of an animation, change a unit's hit points, or upload your own JS art. - - .community_columns - + .community-columns a(href="/editor/article") img(src="/images/pages/community/article.png") - h2 a.spl(href="/editor/level", data-i18n="editor.article_title") - - p See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the - a.spl(href="/editor/article", data-i18n="editor.article_title") - | and help CodeCombat players get the most out of their play time. + p + span(data-i18n="community.article_editor_prefix") See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the + a.spl.spr(href="/editor/article", data-i18n="editor.article_title") + span(data-i18n="community.article_editor_suffix") and help CodeCombat players get the most out of their playtime. div - .half_width + .half-width - h2.lower_titles Find us on these sites + h2.lower-titles + a(href="https://www.facebook.com/codecombat", data-i18n="community.find_us") Find us on these sites - .logo_row + .logo-row - a(href="http://blog.codecombat.com") - img(src="/images/pages/community/logo_sett.png") + a(href="http://blog.codecombat.com") + img(src="/images/pages/community/logo_sett.png") - a(href="http://discourse.codecombat.com") - img(src="/images/pages/community/logo_discourse.png") + a(href="http://discourse.codecombat.com") + img(src="/images/pages/community/logo_discourse.png") - a(href="https://www.facebook.com/codecombat") - img(src="/images/pages/community/logo_facebook.png") + a(href="https://www.facebook.com/codecombat") + img(src="/images/pages/community/logo_facebook.png") - a(href="https://twitter.com/CodeCombat") - img(src="/images/pages/community/logo_twitter.png") + a(href="https://twitter.com/CodeCombat") + img(src="/images/pages/community/logo_twitter.png") - a(href="https://plus.google.com/115285980638641924488/posts") - img(src="/images/pages/community/logo_g+.png") + a(href="https://plus.google.com/115285980638641924488/posts") + img(src="/images/pages/community/logo_g+.png") - a(href="http://www.hipchat.com/g3plnOKqa") - img(src="/images/pages/community/logo_hipchat.png") + a(href="http://www.hipchat.com/g3plnOKqa") + img(src="/images/pages/community/logo_hipchat.png") - .half_width + .half-width - h2.lower_titles Contribute to the Project + h2.lower-titles + a(href="/contribute", data-i18n="community.contribute_to_the_project") Contribute to the project - .logo_row + .logo-row.contribute-classes - a(href="/contribute#adventurer") - img(src="/images/pages/community/adventurer.png") + a(href="/contribute#adventurer") + img(src="/images/pages/community/adventurer.png") - a(href="/contribute#ambassador") - img(src="/images/pages/community/ambassador.png") + a(href="/contribute#ambassador") + img(src="/images/pages/community/ambassador.png") - a(href="/contribute#archmage") - img(src="/images/pages/community/archmage.png") + a(href="/contribute#archmage") + img(src="/images/pages/community/archmage.png") - a(href="/contribute#scribe") - img(src="/images/pages/community/scribe.png") + a(href="/contribute#scribe") + img(src="/images/pages/community/scribe.png") - a(href="/contribute#diplomat") - img(src="/images/pages/community/diplomat.png") + a(href="/contribute#diplomat") + img(src="/images/pages/community/diplomat.png") - a(href="/contribute#artisan") - img(src="/images/pages/community/artisan.png") + a(href="/contribute#artisan") + img(src="/images/pages/community/artisan.png") .clearfix diff --git a/app/templates/contribute/diplomat.jade b/app/templates/contribute/diplomat.jade index e2e6a756c..2ddc3c53b 100644 --- a/app/templates/contribute/diplomat.jade +++ b/app/templates/contribute/diplomat.jade @@ -47,34 +47,25 @@ block content .contributor-signup-anonymous .contributor-signup(data-contributor-class-id="translator", data-contributor-class-name="diplomat") + h3(data-i18n="contribute.translating_diplomats") | Our Translating Diplomats: //#contributor-list // TODO: collect CodeCombat userids for these guys so we can include a tiled list ul.diplomats - li Turkish - Nazım Gediz Aydındoğmuş, cobaimelan, wakeup - li Brazilian Portuguese - Gutenberg Barros, Kieizroe, Matthew Burt, brunoporto, cassiocardoso - li Portugal Portuguese - Matthew Burt, ReiDuKuduro - li German - Dirk, faabsen, HiroP0, Anon, bkimminich - li Thai - Kamolchanok Jittrepit - li Vietnamese - An Nguyen Hoang Thien - li Dutch - Glen De Cauwsemaecker, Guido Zuidhof, Ruben Vereecken, Jasper D'haene - li Greek - Stergios - li Latin American Spanish - Jesús Ruppel, Matthew Burt, Mariano Luzza - li Spain Spanish - Matthew Burt, DanielRodriguezRivero, Anon, Pouyio - li French - Xeonarno, Elfisen, Armaldio, MartinDelille, pstweb, veritable, jaybi, xavismeh, Anon, Feugy - li Hungarian - ferpeter, csuvsaregal, atlantisguru, Anon - li Japanese - g1itch, kengos, treby - li Chinese - Adam23, spacepope, yangxuan8282, Cheng Zheng - li Polish - Anon, Kacper Ciepielewski - li Danish - Einar Rasmussen, sorsjen, Randi Hillerøe, Anon - li Slovak - Anon - li Persian - Reza Habibi (Rehb) - li Czech - vanous - li Russian - fess89, ser-storchak, Mr A, a1ip - li Ukrainian - fess89 - li Italian - flauta - li Norwegian - bardeh + each stats, languageCode in languageStats + if !(languageCode.indexOf('-') != -1 && stats.completion < 0.02 && !stats.diplomats.length) + li + a(href=stats.githubURL) + span= stats.englishDescription + if stats.englishDescription != stats.nativeDescription + span.spl.spr - + span= stats.nativeDescription + if stats.diplomats.length + span.spl - #{stats.diplomats.join(', ')} + .progress + .progress-bar(style='width: ' + (100 * stats.completion) + '%') + span(style=stats.completion < 0.06 ? 'color: black; text-shadow: 0px 1px 0px white' : '')= (100 * stats.completion).toFixed(1) + '%' div.clearfix diff --git a/app/templates/editor/achievement/edit.jade b/app/templates/editor/achievement/edit.jade index 42b59de17..17bab8045 100644 --- a/app/templates/editor/achievement/edit.jade +++ b/app/templates/editor/achievement/edit.jade @@ -2,16 +2,16 @@ extends /templates/base block content if me.isAdmin() - div - ol.breadcrumb - li - a(href="/editor", data-i18n="editor.main_title") CodeCombat Editors - li - a(href="/editor/achievement", data-i18n="editor.achievement_title") Achievement Editor - li.active - | #{achievement.attributes.name} + ol.breadcrumb + li + a(href="/editor", data-i18n="editor.main_title") CodeCombat Editors + li + a(href="/editor/achievement", data-i18n="editor.achievement_title") Achievement Editor + li.active + | #{achievement.attributes.name} button(data-i18n="", disabled=me.isAdmin() === true ? undefined : "true").btn.btn-primary#recalculate-button Recalculate + button(data-i18n="common.delete", disabled=me.isAdmin() === true ? undefined : "true").btn.btn-primary#delete-button Delete button(data-i18n="common.save", disabled=me.isAdmin() === true ? undefined : "true").btn.btn-primary#save-button Save h3(data-i18n="achievement.edit_achievement_title") Edit Achievement @@ -20,12 +20,10 @@ block content #achievement-treema - #achievement-view + #achievement-view.clearfix hr - div#error-view - else .alert.alert-danger span Admin only. Turn around. diff --git a/app/templates/editor/component/add-thang-components-modal.jade b/app/templates/editor/component/add-thang-components-modal.jade new file mode 100644 index 000000000..ff6ef030c --- /dev/null +++ b/app/templates/editor/component/add-thang-components-modal.jade @@ -0,0 +1,22 @@ +extends /templates/modal/modal_base + +block modal-header-content + h1 Add Components + +block modal-body-content + form + ul.list-group + for system in systems + li.list-group-item + div.item-title(data-toggle="collapse", data-target="##{system}").collapsed + span.glyphicon.glyphicon-chevron-down.text-muted + span.glyphicon.glyphicon-chevron-up.text-muted + a.spl= system + span.spl.text-muted= nameLists[system] + .collapse-panel.collapse(id=system) + for component in components[system] + .checkbox + label + input(type='checkbox', value=component.id) + span.spr #{component.get('name')}: + span.text-muted= component.get('description') diff --git a/app/templates/editor/component/thang-component-config-view.jade b/app/templates/editor/component/thang-component-config-view.jade new file mode 100644 index 000000000..c1ef8c916 --- /dev/null +++ b/app/templates/editor/component/thang-component-config-view.jade @@ -0,0 +1,7 @@ +.panel.panel-default + .panel-heading + em #{component.system}. + strong.panel-title.spr= component.name + span#description.text-muted= component.description + .panel-body + .treema diff --git a/app/templates/editor/components/thang-components-edit-view.jade b/app/templates/editor/component/thang-components-edit-view.jade similarity index 60% rename from app/templates/editor/components/thang-components-edit-view.jade rename to app/templates/editor/component/thang-components-edit-view.jade index dbcbf2f10..cbfd948c3 100644 --- a/app/templates/editor/components/thang-components-edit-view.jade +++ b/app/templates/editor/component/thang-components-edit-view.jade @@ -1,6 +1,6 @@ -#extant-components-column.column +#thang-components-column.column h3 Components - p Click then press delete to remove. + button.btn#add-components-button Add Components .treema .column#thang-components-config-column diff --git a/app/templates/editor/components/table.jade b/app/templates/editor/components/table.jade deleted file mode 100755 index cde222790..000000000 --- a/app/templates/editor/components/table.jade +++ /dev/null @@ -1,21 +0,0 @@ -table.table - tr - th(colspan=3) - span(data-i18n="general.results") - | Results - span - |: #{documents.length} - - tr - th(data-i18n="general.name") Name - th(data-i18n="general.description") Description - th(data-i18n="general.version") Version - - for data in documents - - data = data.attributes; - tr - td - a(href="/editor/component/#{data.slug || data._id}") - | #{data.name} - td.body-row #{data.description} - td #{data.version.major}.#{data.version.minor} \ No newline at end of file diff --git a/app/templates/editor/components/thang-component-config-view.jade b/app/templates/editor/components/thang-component-config-view.jade deleted file mode 100644 index ff9a0e199..000000000 --- a/app/templates/editor/components/thang-component-config-view.jade +++ /dev/null @@ -1,7 +0,0 @@ -.panel.panel-default - .panel-heading - strong.panel-title= component.name - em.spl.spr (#{component.system}) - span#description= component.description - .panel-body - .treema diff --git a/app/templates/editor/level/fork.jade b/app/templates/editor/fork-modal.jade similarity index 62% rename from app/templates/editor/level/fork.jade rename to app/templates/editor/fork-modal.jade index 6c4f43553..2b4db3463 100644 --- a/app/templates/editor/level/fork.jade +++ b/app/templates/editor/fork-modal.jade @@ -4,14 +4,14 @@ block modal-header-content h3(data-i18n="editor.fork_title") Fork New Version block modal-body-content - form#save-level-form.form + form.form .form-group - label(for="level-name", data-i18n="general.name") Name - input#level-name(name="name", type="text").form-control + label(for="model-name", data-i18n="general.name") Name + input#fork-model-name(name="name", type="text").form-control block modal-footer-content button.btn(data-dismiss="modal", data-i18n="common.cancel") Cancel - button.btn.btn-primary#fork-level-confirm-button(data-i18n="common.save") Save + button.btn.btn-primary#fork-model-confirm-button(data-i18n="common.save") Save block modal-body-wait-content h3(data-i18n="editor.fork_creating") Creating Fork... diff --git a/app/templates/editor/level/edit.jade b/app/templates/editor/level/edit.jade index 3f16f5559..d61965365 100644 --- a/app/templates/editor/level/edit.jade +++ b/app/templates/editor/level/edit.jade @@ -33,6 +33,8 @@ block header - var patches = level.get('patches') if patches && patches.length span.badge= patches.length + li + a(href="#related-achievements-view", data-toggle="tab") Achievements li a(href="#docs-components-view", data-toggle="tab", data-i18n="editor.level_tab_docs") Documentation .navbar-header @@ -83,7 +85,7 @@ block header span.spl(data-i18n="common.unwatch") Unwatch li(class=anonymous ? "disabled": "") - a(data-i18n="common.fork")#fork-level-start-button Fork + a(data-i18n="common.fork")#fork-start-button Fork li(class=anonymous ? "disabled": "") a(data-toggle="coco-modal", data-target="modal/RevertModal", data-i18n="editor.revert")#revert-button Revert li(class=anonymous ? "disabled": "") @@ -121,8 +123,10 @@ block outer_content div.tab-pane#editor-level-patches .patches-view + div.tab-pane#related-achievements-view + div.tab-pane#docs-components-view div#error-view -block footer \ No newline at end of file +block footer diff --git a/app/templates/editor/level/modal/new-achievement.jade b/app/templates/editor/level/modal/new-achievement.jade new file mode 100644 index 000000000..dfcc39cbc --- /dev/null +++ b/app/templates/editor/level/modal/new-achievement.jade @@ -0,0 +1,23 @@ +extends /templates/modal/new_model + +block modal-body-content + form.form + .form-group + label.control-label(for="name", data-i18n="general.name") Name + input#name.form-control(name="name", type="text") + .form-group + label.control-label(for="description" data-i18n="general.description") Description + input#description.form-control(name="description", type="text") + h4(data-i18n="editor.achievement_query_misc") Key achievement off of miscellanea + .radio + label + input(type="checkbox", name="queryOptions" id="misc-level-completion" value="misc-level-completion") + span.spl(data-i18n="editor.level_completion") Level Completion + - var goals = level.get('goals'); + if goals && goals.length + h4(data-i18n="editor.achievement_query_goals") Key achievement off of level goals + each goal in goals + .radio + label + input(type="checkbox", name="queryOptions" id="#{goal.id}" value="#{goal.id}") + span.spl= goal.name diff --git a/app/templates/editor/level/related-achievements.jade b/app/templates/editor/level/related-achievements.jade new file mode 100644 index 000000000..e0312d779 --- /dev/null +++ b/app/templates/editor/level/related-achievements.jade @@ -0,0 +1,26 @@ + +button.btn.btn-primary#new-achievement-button(disabled=me.isAdmin() === true ? undefined : "true" data-i18n="editor.new_achievement_title") Create a New Achievement + +if achievements.loading + h2(data-i18n="common.loading") Loading... +else if ! achievements.models.length + .panel + .panel-body + p(data-i18n="editor.no_achievements") No achievements added for this level yet. +else + table.table.table-hover + thead + tr + th + th(data-i18n="general.name") Name + th(data-i18n="general.description") Description + th XP + tbody + each achievement in achievements.models + tr + td(style="width: 20px") + img.achievement-icon-small(src=achievement.getImageURL() alt="#{achievement.get('name') icon") + td + a(href="/editor/achievement/#{achievement.get('slug')}")= achievement.get('name') + td= achievement.get('description') + td= achievement.get('worth') diff --git a/app/templates/editor/level/thang/edit.jade b/app/templates/editor/level/thang/level-thang-edit-view.jade similarity index 100% rename from app/templates/editor/level/thang/edit.jade rename to app/templates/editor/level/thang/level-thang-edit-view.jade diff --git a/app/templates/editor/level/thangs_tab.jade b/app/templates/editor/level/thangs_tab.jade index 8d47c5f2c..c46e51363 100644 --- a/app/templates/editor/level/thangs_tab.jade +++ b/app/templates/editor/level/thangs_tab.jade @@ -36,4 +36,4 @@ button.navbar-toggle.toggle.btn-primary#thangs-palette-toggle(type="button", dat #canvas-top-gradient.gradient .add-thangs-palette.thangs-column#add-thangs-column -#editor-level-thang-edit.secret \ No newline at end of file +#level-thang-edit-view.secret \ No newline at end of file diff --git a/app/templates/editor/thang/thang-type-edit-view.jade b/app/templates/editor/thang/thang-type-edit-view.jade index f3560d212..394c1f97a 100644 --- a/app/templates/editor/thang/thang-type-edit-view.jade +++ b/app/templates/editor/thang/thang-type-edit-view.jade @@ -33,6 +33,16 @@ block header span.navbar-brand #{thangType.attributes.name} ul.nav.navbar-nav.navbar-right + li.dropdown + a(data-toggle='dropdown').play-with-level-parent + span.glyphicon-play.glyphicon + ul.dropdown-menu + li.dropdown-header Play Which Level? + li + for level in recentlyPlayedLevels + a.play-with-level-button(data-level=level)= level + input.play-with-level-input(placeholder="Type in a level name") + if authorized li#save-button a @@ -42,6 +52,8 @@ block header span.glyphicon-chevron-down.glyphicon ul.dropdown-menu li.dropdown-header Actions + li(class=anonymous ? "disabled": "") + a(data-i18n="common.fork")#fork-start-button Fork li(class=anonymous ? "disabled": "") a(data-toggle="coco-modal", data-target="modal/RevertModal", data-i18n="editor.revert")#revert-button Revert li.divider diff --git a/app/templates/game-menu/choose-hero-view.jade b/app/templates/game-menu/choose-hero-view.jade index c2d7fd5c7..acef1c498 100644 --- a/app/templates/game-menu/choose-hero-view.jade +++ b/app/templates/game-menu/choose-hero-view.jade @@ -1,17 +1,18 @@ h3(data-i18n="play_level.reload_title") Reload All Code? p(data-i18n="play_level.reload_really") Are you sure you want to reload this level back to the beginning? - + p a(href='#', data-dismiss="modal", aria-hidden="true", data-i18n="play_level.reload_confirm").btn.btn-primary#restart-level-confirm-button Reload All - -img(src="/images/pages/game-menu/choose-hero-stub.png") - -div(data-i18n="choose_hero.temp") Temp - -h3 Interactions -ul - li Click a language button. Click ‘save as default language’ if you want to carry it over to following levels. - li Click a hero. Right here it’s just a simple list on the left with a picture of the hero on the right. Might instead have a carousel on the left and stats on the right. Basically this needs more thought because it’s starting to look like the inventory screen, but this is more for later. Might also have the wizard coloring used here for heroes. - li Click equip and it puts in basically the inventory screen view to choose which items to start the level with. - li Click begin. A new LevelSession is created. LevelLoader is given the new/updated LevelSession, new data is loaded, world reruns. + +if showDevBits + img(src="/images/pages/game-menu/choose-hero-stub.png") + + div(data-i18n="choose_hero.temp") Temp + + h3 Interactions + ul + li Click a language button. Click ‘save as default language’ if you want to carry it over to following levels. + li Click a hero. Right here it’s just a simple list on the left with a picture of the hero on the right. Might instead have a carousel on the left and stats on the right. Basically this needs more thought because it’s starting to look like the inventory screen, but this is more for later. Might also have the wizard coloring used here for heroes. + li Click equip and it puts in basically the inventory screen view to choose which items to start the level with. + li Click begin. A new LevelSession is created. LevelLoader is given the new/updated LevelSession, new data is loaded, world reruns. diff --git a/app/templates/game-menu/game-menu-modal.jade b/app/templates/game-menu/game-menu-modal.jade index 2a36dabca..a8d8fb6ed 100644 --- a/app/templates/game-menu/game-menu-modal.jade +++ b/app/templates/game-menu/game-menu-modal.jade @@ -5,6 +5,11 @@ block modal-header block modal-body-content .tabbable.tabs-left - var submenus = ["inventory", "choose-hero", "save-load", "options", "guide", "multiplayer"] + - if (!showDevBits) { // Not done yet. + - submenus.splice(4, 1); + - submenus.splice(2, 1); + - submenus.splice(0, 1); + - } ul.nav.nav-tabs for submenu, index in submenus li(class=index ? "" : "active") diff --git a/app/templates/game-menu/inventory-view.jade b/app/templates/game-menu/inventory-view.jade index 3082c87fc..7bf5182ee 100644 --- a/app/templates/game-menu/inventory-view.jade +++ b/app/templates/game-menu/inventory-view.jade @@ -1,11 +1,27 @@ -img(src="/images/pages/game-menu/inventory-stub.png") - -div(data-i18n="inventory.temp") Temp - -h3 Interactions -ul - li Click an item slot. It is highlighted and items that can go in that slot show up on the right with short descriptions. Full info about it shows up on the lower left. - li Click an item on the menu. It shows up on the lower right. - li To equip an item: drag (if ipad), double click (if web), click swap button (either) - li Click an item on the menu. It swaps the item into the slot. - li If the equipment changed and the player clicks done, a new LevelSession is created with this new equipment. If “use current code” is selected, the code for the current session is copied over to the new session. Modal closes, data is loaded, world runs, etc. +div#equipped + h3 Equipped + - for (var i=0; i < slots.length; i += 3) { + div + - for (var j=i; j < slots.length && j < i + 3; j++) { + - var slot = slots[j]; + div.panel.panel-default.item-slot(data-slot=slot) + .panel-heading + .panel-title.slot-name= slot + .panel-body.slot-item + if equipment[slot] + - var item = equipment[slot] + .replace-me(data-item-id=item.id) + - } + .clearfix + - } + +div#available-equipment + h3 Available + for item in items + .list-group-item(class=item.classes, data-item-id=item.id) + +div#selected-items + #selected-equipped-item.well + .item-view-stub + #selected-available-item.well + .item-view-stub diff --git a/app/templates/game-menu/item-view.jade b/app/templates/game-menu/item-view.jade new file mode 100644 index 000000000..04dc9e350 --- /dev/null +++ b/app/templates/game-menu/item-view.jade @@ -0,0 +1,12 @@ +img(src=item.getPortraitURL()).img-thumbnail +div.item-info + if includes.name + strong= item.get('name') + if includes.stats + - var stats = item.getFrontFacingStats() + ul + for stat in stats + li #{stat.name}: #{stat.value} +.clearfix + + \ No newline at end of file diff --git a/app/templates/game-menu/options-view.jade b/app/templates/game-menu/options-view.jade index 732392eda..ee4010dd2 100644 --- a/app/templates/game-menu/options-view.jade +++ b/app/templates/game-menu/options-view.jade @@ -8,6 +8,13 @@ .form h3(data-i18n="options.general_options") General Options + .form-group.slider-group + label(for="option-volume") + span(data-i18n="options.volume") Volume + span.spr : + span#option-volume-value= (me.get('volume') * 100).toFixed(0) + '%' + #option-volume.slider + .form-group.checkbox label(for="option-music") input#option-music(name="option-music", type="checkbox", checked=music) diff --git a/app/templates/kinds/search.jade b/app/templates/kinds/search.jade index 0e522d272..d69074636 100644 --- a/app/templates/kinds/search.jade +++ b/app/templates/kinds/search.jade @@ -12,32 +12,12 @@ block content if me.get('anonymous') a.btn.btn-primary.open-modal-button(data-toggle="coco-modal", data-target="modal/AuthModal", role="button", data-i18n="#{currentNewSignup}") Log in to Create a New Content else - a.btn.btn-primary.open-modal-button(href='#new-model-modal', role="button", data-toggle="modal", data-i18n="#{currentNew}") Create a New Something + a.btn.btn-primary.open-modal-button#new-model-button(data-i18n="#{currentNew}") Create a New Something input#search(data-i18n="[placeholder]#{currentSearch}") hr div.results table - // TODO: make this into a ModalView subview - div.modal.fade#new-model-modal - .modal-dialog - .background-wrapper - .modal-content - .modal-header - h3(data-i18n="#{currentNew}") Create New #{modelLabel} - .modal-body - form.form - .form-group - label.control-label(for="name", data-i18n="general.name") Name - input#name.form-control(name="name", type="text") - .modal-footer - button.btn(data-dismiss="modal", data-i18n="common.cancel") Cancel - button.btn.btn-primary.new-model-submit(data-i18n="common.create") Create - .modal-body.wait.secret - h3(data-i18n="play_level.tip_reticulating") Reticulating Splines... - .progress.progress-striped.active - .progress-bar - else .alert.alert-danger span Admin only. Turn around. diff --git a/app/templates/kinds/user.jade b/app/templates/kinds/user.jade new file mode 100644 index 000000000..1bcd19c1c --- /dev/null +++ b/app/templates/kinds/user.jade @@ -0,0 +1,13 @@ +extends /templates/base + +// User pages might have some user page specific header, if not remove this +block content + .clearfix + if user && viewName + ol.breadcrumb + li + a(href="/user/#{user.getSlugOrID()}") #{user.displayName()} + li.active + | #{viewName} + if !user || user.loading + | LOADING diff --git a/app/templates/modal/new_model.jade b/app/templates/modal/new_model.jade new file mode 100644 index 000000000..c904d1b96 --- /dev/null +++ b/app/templates/modal/new_model.jade @@ -0,0 +1,19 @@ +extends /templates/modal/modal_base + +block modal-header-content + h3(data-i18n="#{currentNew}") Create New #{modelLabel} + +block modal-body-content + form.form + .form-group + label.control-label(for="name", data-i18n="general.name") Name + input#name.form-control(name="name", type="text") + +block modal-footer + .modal-footer + button.btn(data-dismiss="modal", data-i18n="common.cancel") Cancel + button.btn.btn-primary.new-model-submit(data-i18n="common.create") Create + .modal-body.wait.secret + h3(data-i18n="play_level.tip_reticulating") Reticulating Splines... + .progress.progress-striped.active + .progress-bar diff --git a/app/templates/user/achievements.jade b/app/templates/user/achievements.jade new file mode 100644 index 000000000..33833d6f3 --- /dev/null +++ b/app/templates/user/achievements.jade @@ -0,0 +1,52 @@ +extends /templates/kinds/user + +block append content + .btn-group.pull-right + button#grid-layout-button.btn.btn-default(data-layout='grid', class=activeLayout==='grid' ? 'active' : '') + i.glyphicon.glyphicon-th + button#table-layout-button.btn.btn-default(data-layout='table', class=activeLayout==='table' ? 'active' : '') + i.glyphicon.glyphicon-th-list + if achievementsByCategory + if activeLayout === 'grid' + .grid-layout + each achievements, category in achievementsByCategory + .row + h2.achievement-category-title(data-i18n="category_#{category}")=category + each achievement, index in achievements + - var title = achievement.i18nName(); + - var description = achievement.i18nDescription(); + - var locked = ! achievement.get('unlocked'); + - var style = achievement.getStyle() + - var imgURL = achievement.getImageURL(); + if locked + - var imgURL = achievement.getLockedImageURL(); + else + - var imgURL = achievement.getImageURL(); + .col-lg-4.col-xs-12 + include ../achievements/achievement-popup + else if activeLayout === 'table' + .table-layout + if earnedAchievements.length + table.table + tr + th(data-i18n="general.name") Name + th(data-i18n="general.description") Description + th(data-i18n="general.date") Date + th(data-i18n="achievements.amount_achieved") Amount + th XP + each earnedAchievement in earnedAchievements.models + - var achievement = earnedAchievement.get('achievement'); + tr + td= achievement.i18nName() + td= achievement.i18nDescription() + td= moment().format("MMMM Do YYYY", earnedAchievement.get('changed')) + if achievement.isRepeatable() + td= earnedAchievement.get('achievedAmount') + else + td + td= earnedAchievement.get('earnedPoints') + else + .panel#no-achievements + .panel-body(data-i18n="user.no_achievements") No achievements earned yet. + else + div How did you even do that? diff --git a/app/templates/user/user_home.jade b/app/templates/user/user_home.jade new file mode 100644 index 000000000..75b4fcca6 --- /dev/null +++ b/app/templates/user/user_home.jade @@ -0,0 +1,133 @@ +extends /templates/kinds/user + +block append content + if user + .vertical-buffer + .row + .left-column + .profile-wrapper + img.picture(src="#{user.getPhotoURL(150)}" alt="") + div.profile-info + h3.name= user.get('name') + if favoriteLanguage + div.extra-info + span(data-i18n="user.favorite_prefix") Favorite language is + strong.favorite-language= favoriteLanguage + span(data-i18n="user.favorite_postfix") . + .btn-group-vertical.profile-menu + a.btn.btn-default(href="/user/#{user.getSlugOrID()}/profile") + i.glyphicon.glyphicon-briefcase + span(data-i18n="account_settings.job_profile") Job Profile + a.btn.btn-default(href="/user/#{user.getSlugOrID()}/stats") + i.glyphicon.glyphicon-certificate + span(data-i18n="user.stats") Stats + a.btn.btn-default.disabled(href="#") + i.glyphicon.glyphicon-pencil + span(data-i18n="general.code") Code + - var emails = user.get('emails') + if emails + ul.contributor-categories + //li.contributor-category + img.contributor-image(src="/images/pages/user/general.png") + h4.contributor-title CodeCombateer + if emails.adventurerNews + li.contributor-category + img.contributor-image(src="/images/pages/user/adventurer.png") + h4.contributor-title + a(href="/contribute#adventurer" data-i18n="classes.adventurer_title") Adventurer + if emails.ambassadorNews + li.contributor-category + img.contributor-image(src="/images/pages/user/ambassador.png") + h4.contributor-title + a(href="/contribute#ambassador" data-i18n="classes.ambassador_title") Ambassador + if emails.archmageNews + li.contributor-category + img.contributor-image(src="/images/pages/user/archmage.png") + h4.contributor-title + a(href="/contribute#archmage" data-i18n="classes.archmage_title") Archmage + if emails.artisanNews + li.contributor-category + img.contributor-image(src="/images/pages/user/artisan.png") + h4.contributor-title + a(href="/contribute#artisan" data-i18n="classes.artisan_title") Artisan + if emails.scribeNews + li.contributor-category + img.contributor-image(src="/images/pages/user/scribe.png") + h4.contributor-title + a(href="/contribute#scribe" data-i18n="classes.scribe_title") Scribe + + .right-column + .panel.panel-default + .panel-heading + h3.panel-title(data-i18n="user.singleplayer_title") Singleplayer Levels + if (!singlePlayerSessions) + .panel-body + p(data-i18n="common.loading") Loading... + else if (singlePlayerSessions.length) + table.table + tr + th.col-xs-4(data-i18n="resources.level") Level + th.col-xs-4(data-i18n="user.last_played") Last Played + th.col-xs-4(data-i18n="user.status") Status + each session in singlePlayerSessions + if session.get('levelName') + tr + td + a(href="/play/level/#{session.get('levelID')}")= session.get('levelName') + td= moment(session.get('changed')).fromNow() + if session.get('state') && session.get('state').complete === true + td(data-i18n="user.status_completed") Completed + else + td(data-i18n="user.status_unfinished") Unfinished + else + .panel-body + p(data-i18n="no_singleplayer") No Singleplayer games played yet. + .panel.panel-default + .panel-heading + h3.panel-title(data-i18n="no_multiplayer") Multiplayer Levels + if (!multiPlayerSessions) + .panel-body + p(data-i18n="common.loading") Loading... + else if (multiPlayerSessions.length) + table.table + tr + th.col-xs-4(data-i18n="resources.level") Level + th.col-xs-4(data-i18n="user.last_played") Last Played + th.col-xs-4(data-i18n="general.score") Score + each session in multiPlayerSessions + tr + td + - var posturl = '' + - if (session.get('team')) posturl = '?team=' + session.get('team') + a(href="/play/level/#{session.get('levelID') + posturl}")= session.get('levelName') + (session.get('team') ? ' (' + session.get('team') + ')' : '') + td= moment(session.get('changed')).fromNow() + if session.get('totalScore') + td= session.get('totalScore') * 100 + else + td(data-i18n="user.status_unfinished") Unfinished + else + .panel-body + p(data-i18n="user.no_multiplayer") No Multiplayer games played yet. + .panel.panel-default + .panel-heading + h3.panel-title(data-i18n="user.achievements") Achievements + if ! earnedAchievements + .panel-body + p(data-i18n="common.loading") Loading... + else if ! earnedAchievements.length + .panel-body + p(data-i18n="user.no_achievements") No achievements earned so far. + else + table.table + tr + th.col-xs-4(data-i18n="achievements.achievement") Achievement + th.col-xs-4(data-i18n="achievements.last_earned") Last Earned + th.col-xs-4(data-i18n="achievements.amount_achieved") Amount + each achievement in earnedAchievements.models + tr + td= achievement.get('achievementName') + td= moment().format("MMMM Do YYYY", achievement.get('changed')) + if achievement.get('achievedAmount') + td= achievement.get('achievedAmount') + else + td diff --git a/app/views/CommunityView.coffee b/app/views/CommunityView.coffee index 15d28300a..8f61e1a24 100644 --- a/app/views/CommunityView.coffee +++ b/app/views/CommunityView.coffee @@ -4,3 +4,18 @@ template = require 'templates/community' module.exports = class CommunityView extends RootView id: 'community-view' template: template + + afterRender: -> + super() + @$el.find('.contribute-classes a').each -> + characterClass = $(@).attr('href').split('#')[1] + title = $.i18n.t("classes.#{characterClass}_title") + titleDescription = $.i18n.t("classes.#{characterClass}_title_description") + if characterClass is 'artisan' + summary = $.i18n.t("contribute.#{characterClass}_summary_pref") + ' Mondo Bizarro' + $.i18n.t("contribute.#{characterClass}_summary_suf") + else if characterClass is 'scribe' + summary = $.i18n.t("contribute.#{characterClass}_summary_pref") + 'Mozilla Developer Network' + $.i18n.t("contribute.#{characterClass}_summary_suf") + else + summary = $.i18n.t("contribute.#{characterClass}_summary") + explanation = "

#{title} #{titleDescription}

#{summary}" + $(@).popover(placement: 'bottom', trigger: 'hover', container: 'body', content: explanation, html: true) diff --git a/app/views/DemoView.coffee b/app/views/DemoView.coffee index d18190162..24fe9090d 100644 --- a/app/views/DemoView.coffee +++ b/app/views/DemoView.coffee @@ -1,4 +1,5 @@ -CocoView = require 'views/kinds/CocoView' +RootView = require 'views/kinds/RootView' +ModalView = require 'views/kinds/ModalView' template = require 'templates/demo' requireUtils = require 'lib/requireUtils' @@ -23,7 +24,7 @@ DEMO_URL_PREFIX = '/demo/' ### -module.exports = DemoView = class DemoView extends CocoView +module.exports = DemoView = class DemoView extends RootView id: 'demo-view' template: template @@ -81,7 +82,10 @@ module.exports = DemoView = class DemoView extends CocoView jasmine.Ajax.install() view = demoFunc() return unless view - @$el.find('#demo-area').empty().append(view.$el) + if view instanceof ModalView + @openModalView(view) + else + @$el.find('#demo-area').empty().append(view.$el) view.afterInsert() # TODO, maybe handle root views differently than modal views differently than everything else? diff --git a/app/views/account/MainAccountView.coffee b/app/views/account/MainAccountView.coffee new file mode 100644 index 000000000..a14e2192a --- /dev/null +++ b/app/views/account/MainAccountView.coffee @@ -0,0 +1,38 @@ +View = require 'views/kinds/RootView' +template = require 'templates/account/account_home' +{me} = require 'lib/auth' +User = require 'models/User' +AuthModalView = require 'views/modal/AuthModal' +RecentlyPlayedCollection = require 'collections/RecentlyPlayedCollection' +ThangType = require 'models/ThangType' + +module.exports = class MainAccountView extends View + id: 'account-home' + template: template + + constructor: (options) -> + super options + return unless me + @wizardType = ThangType.loadUniversalWizard() + @recentlyPlayed = new RecentlyPlayedCollection me.get('_id') + @supermodel.loadModel @wizardType, 'thang' + @supermodel.loadCollection @recentlyPlayed, 'recentlyPlayed' + + onLoaded: -> + super() + + getRenderData: -> + c = super() + c.subs = {} + enabledEmails = c.me.getEnabledEmails() + c.subs[sub] = 1 for sub in enabledEmails + c.hasEmailNotes = _.any enabledEmails, (sub) -> sub.contains 'Notes' + c.hasEmailNews = _.any enabledEmails, (sub) -> sub.contains('News') and sub isnt 'generalNews' + c.hasGeneralNews = 'generalNews' in enabledEmails + c.wizardSource = @wizardType.getPortraitSource colorConfig: me.get('wizard')?.colorConfig if @wizardType.loaded + c.recentlyPlayed = @recentlyPlayed.models + c + + afterRender: -> + super() + @openModalView new AuthModalView if me.isAnonymous() diff --git a/app/views/achievements/AchievementPopup.coffee b/app/views/achievements/AchievementPopup.coffee new file mode 100644 index 000000000..82e464734 --- /dev/null +++ b/app/views/achievements/AchievementPopup.coffee @@ -0,0 +1,91 @@ +CocoView = require 'views/kinds/CocoView' +template = require 'templates/achievements/achievement-popup' +User = require '../../models/User' +Achievement = require '../../models/Achievement' + +module.exports = class AchievementPopup extends CocoView + className: 'achievement-popup' + template: template + + constructor: (options) -> + @achievement = options.achievement + @earnedAchievement = options.earnedAchievement + @container = options.container or @getContainer() + @popup = options.container + @popup ?= true + @className += ' popup' if @popup + super options + console.debug 'Created an AchievementPopup', @$el + + @render() + + calculateData: -> + currentLevel = me.level() + nextLevel = currentLevel + 1 + currentLevelExp = User.expForLevel(currentLevel) + nextLevelXP = User.expForLevel(nextLevel) + totalExpNeeded = nextLevelXP - currentLevelExp + expFunction = @achievement.getExpFunction() + currentXP = me.get 'points' + if @achievement.isRepeatable() + achievedXP = expFunction(@earnedAchievement.get('previouslyAchievedAmount')) * @achievement.get('worth') if @achievement.isRepeatable() + else + achievedXP = @achievement.get 'worth' + previousXP = currentXP - achievedXP + leveledUp = currentXP - achievedXP < currentLevelExp + #console.debug 'Leveled up' if leveledUp + alreadyAchievedPercentage = 100 * (previousXP - currentLevelExp) / totalExpNeeded + alreadyAchievedPercentage = 0 if alreadyAchievedPercentage < 0 # In case of level up + newlyAchievedPercentage = if leveledUp then 100 * (currentXP - currentLevelExp) / totalExpNeeded else 100 * achievedXP / totalExpNeeded + + #console.debug "Current level is #{currentLevel} (#{currentLevelExp} xp), next level is #{nextLevel} (#{nextLevelXP} xp)." + #console.debug "Need a total of #{nextLevelXP - currentLevelExp}, already had #{previousXP} and just now earned #{achievedXP} totalling on #{currentXP}" + + data = + title: @achievement.i18nName() + imgURL: @achievement.getImageURL() + description: @achievement.i18nDescription() + level: currentLevel + currentXP: currentXP + newXP: achievedXP + leftXP: nextLevelXP - currentXP + oldXPWidth: alreadyAchievedPercentage + newXPWidth: newlyAchievedPercentage + leftXPWidth: 100 - newlyAchievedPercentage - alreadyAchievedPercentage + + getRenderData: -> + c = super() + _.extend c, @calculateData() + c.style = @achievement.getStyle() + c.popup = true + c.$ = $ # Allows the jade template to do i18n + c + + render: -> + console.debug 'render achievement popup' + super() + @container.prepend @$el + if @popup + @$el.animate + left: 0 + @$el.on 'click', (e) => + @$el.animate + left: 600 + , => + @$el.remove() + @destroy() + + getContainer: -> + unless @container + @container = $('.achievement-popup-container') + unless @container.length + $('body').append('
') + @container = $('.achievement-popup-container') + @container + + afterRender: -> + super() + _.delay @initializeTooltips, 1000 # TODO this could be smoother + + initializeTooltips: -> + $('.progress-bar').tooltip() diff --git a/app/views/contribute/ArchmageView.coffee b/app/views/contribute/ArchmageView.coffee index dd21e40ae..e9847448a 100644 --- a/app/views/contribute/ArchmageView.coffee +++ b/app/views/contribute/ArchmageView.coffee @@ -7,6 +7,7 @@ module.exports = class ArchmageView extends ContributeClassView contributorClassName: 'archmage' contributors: [ + {id: '52ccfc9bd3eb6b5a4100b60d', name: 'Glen De Cauwsemaecker', github: 'GlenDC'} {id: '52bfc3ecb7ec628868001297', name: 'Tom Steinbrecher', github: 'TomSteinbrecher'} {id: '5272806093680c5817033f73', name: 'Sébastien Moratinos', github: 'smoratinos'} {name: 'deepak1556', avatar: 'deepak', github: 'deepak1556'} diff --git a/app/views/contribute/DiplomatView.coffee b/app/views/contribute/DiplomatView.coffee index 32572cce0..1f075803f 100644 --- a/app/views/contribute/DiplomatView.coffee +++ b/app/views/contribute/DiplomatView.coffee @@ -6,3 +6,87 @@ module.exports = class DiplomatView extends ContributeClassView id: 'diplomat-view' template: template contributorClassName: 'diplomat' + + getRenderData: -> + context = super() + context.viewName = @viewName + context.user = @user unless @user?.isAnonymous() + context.languageStats = @calculateSpokenLanguageStats() + context + + calculateSpokenLanguageStats: -> + @locale ?= require 'locale/locale' + totalStrings = @countStrings @locale.en + languageStats = {} + for languageCode, language of @locale + languageStats[languageCode] = + githubURL: "https://github.com/codecombat/codecombat/blob/master/app/locale/#{languageCode}.coffee" + completion: @countStrings(language) / totalStrings + nativeDescription: language.nativeDescription + englishDescription: language.englishDescription + diplomats: @diplomats[languageCode] + languageCode: languageCode + languageStats + + countStrings: (language) -> + translated = 0 + for section, strings of language.translation + translated += _.size strings + translated + + diplomats: + en: [] # English - English + 'en-US': [] # English (US), English (US) + 'en-GB': [] # English (UK), English (UK) + 'en-AU': [] # English (AU), English (AU) + ru: ['fess89', 'ser-storchak', 'Mr A', 'a1ip'] # русский язык, Russian + de: ['Dirk', 'faabsen', 'HiroP0', 'Anon', 'bkimminich'] # Deutsch, German + 'de-DE': [] # Deutsch (Deutschland), German (Germany) + 'de-AT': [] # Deutsch (Österreich), German (Austria) + 'de-CH': [] # Deutsch (Schweiz), German (Switzerland) + es: [] # español, Spanish + 'es-419': ['Jesús Ruppel', 'Matthew Burt', 'Mariano Luzza'] # español (América Latina), Spanish (Latin America) + 'es-ES': ['Matthew Burt', 'DanielRodriguezRivero', 'Anon', 'Pouyio'] # español (ES), Spanish (Spain) + zh: ['Adam23', 'spacepope', 'yangxuan8282', 'Cheng Zheng'] # 中文, Chinese + 'zh-HANS': [] # 简体中文, Chinese (Simplified) + 'zh-HANT': [] # 繁体中文, Chinese (Traditional) + 'zh-WUU-HANS': [] # 吴语, Wuu (Simplified) + 'zh-WUU-HANT': [] # 吳語, Wuu (Traditional) + fr: ['Xeonarno', 'Elfisen', 'Armaldio', 'MartinDelille', 'pstweb', 'veritable', 'jaybi', 'xavismeh', 'Anon', 'Feugy'] # français, French + ja: ['g1itch', 'kengos', 'treby'] # 日本語, Japanese + ar: [] # العربية, Arabic + pt: [] # português, Portuguese + 'pt-BR': ['Gutenberg Barros', 'Kieizroe', 'Matthew Burt', 'brunoporto', 'cassiocardoso'] # português do Brasil, Portuguese (Brazil) + 'pt-PT': ['Matthew Burt', 'ReiDuKuduro', 'Imperadeiro98'] # Português (Portugal), Portuguese (Portugal) + pl: ['Anon', 'Kacper Ciepielewski'] # język polski, Polish + it: ['flauta'] # italiano, Italian + tr: ['Nazım Gediz Aydındoğmuş', 'cobaimelan', 'wakeup'] # Türkçe, Turkish + nl: ['Glen De Cauwsemaecker', 'Guido Zuidhof', 'Ruben Vereecken', 'Jasper D\'haene'] # Nederlands, Dutch + 'nl-BE': [] # Nederlands (België), Dutch (Belgium) + 'nl-NL': [] # Nederlands (Nederland), Dutch (Netherlands) + fa: ['Reza Habibi (Rehb)'] # فارسی, Persian + cs: ['vanous'] # čeština, Czech + sv: [] # Svenska, Swedish + id: [] # Bahasa Indonesia, Indonesian + el: ['Stergios'] # ελληνικά, Greek + ro: [] # limba română, Romanian + vi: ['An Nguyen Hoang Thien'] # Tiếng Việt, Vietnamese + hu: ['ferpeter', 'csuvsaregal', 'atlantisguru', 'Anon'] # magyar, Hungarian + th: ['Kamolchanok Jittrepit'] # ไทย, Thai + da: ['Einar Rasmussen', 'sorsjen', 'Randi Hillerøe', 'Anon'] # dansk, Danish + ko: [] # 한국어, Korean + sk: ['Anon'] # slovenčina, Slovak + sl: [] # slovenščina, Slovene + fi: [] # suomi, Finnish + bg: [] # български език, Bulgarian + no: ['bardeh'] # Norsk, Norwegian + nn: [] # Norwegian (Nynorsk), Norwegian Nynorsk + nb: [] # Norsk Bokmål, Norwegian (Bokmål) + he: [] # עברית, Hebrew + lt: [] # lietuvių kalba, Lithuanian + sr: [] # српски, Serbian + uk: ['fess89'] # українська мова, Ukrainian + hi: [] # मानक हिन्दी, Hindi + ur: [] # اُردُو, Urdu + ms: [] # Bahasa Melayu, Bahasa Malaysia + ca: [] # Català, Catalan diff --git a/app/views/editor/ForkModal.coffee b/app/views/editor/ForkModal.coffee new file mode 100644 index 000000000..5acbaa1df --- /dev/null +++ b/app/views/editor/ForkModal.coffee @@ -0,0 +1,43 @@ +ModalView = require 'views/kinds/ModalView' +template = require 'templates/editor/fork-modal' +forms = require 'lib/forms' + +module.exports = class ForkModal extends ModalView + id: 'fork-modal' + template: template + instant: false + modalWidthPercent: 60 + + events: + 'click #fork-model-confirm-button': 'forkModel' + 'submit form': 'forkModel' + + constructor: (options) -> + super options + @editorPath = options.editorPath # like 'level' or 'thang' + @model = options.model + @modelClass = @model.constructor + + forkModel: -> + @showLoading() + forms.clearFormAlerts(@$el) + newModel = new @modelClass($.extend(true, {}, @model.attributes)) + newModel.unset '_id' + newModel.unset 'version' + newModel.unset 'creator' + newModel.unset 'created' + newModel.unset 'original' + newModel.unset 'parent' + newModel.set 'commitMessage', "Forked from #{@model.get('name')}" + newModel.set 'name', @$el.find('#fork-model-name').val() + if @model.get 'permissions' + newModel.set 'permissions', [access: 'owner', target: me.id] + newPathPrefix = "editor/#{@editorPath}/" + res = newModel.save() + return unless res + res.error => + @hideLoading() + forms.applyErrorsToForm(@$el.find('form'), JSON.parse(res.responseText)) + res.success => + @hide() + application.router.navigate(newPathPrefix + newModel.get('slug'), {trigger: true}) diff --git a/app/views/editor/achievement/AchievementEditView.coffee b/app/views/editor/achievement/AchievementEditView.coffee index ce5da02bb..98d6a4f32 100644 --- a/app/views/editor/achievement/AchievementEditView.coffee +++ b/app/views/editor/achievement/AchievementEditView.coffee @@ -1,7 +1,10 @@ RootView = require 'views/kinds/RootView' template = require 'templates/editor/achievement/edit' Achievement = require 'models/Achievement' +AchievementPopup = require 'views/achievements/AchievementPopup' ConfirmModal = require 'views/modal/ConfirmModal' +errors = require 'lib/errors' +app = require 'application' module.exports = class AchievementEditView extends RootView id: 'editor-achievement-edit-view' @@ -11,6 +14,7 @@ module.exports = class AchievementEditView extends RootView events: 'click #save-button': 'saveAchievement' 'click #recalculate-button': 'confirmRecalculation' + 'click #delete-button': 'confirmDeletion' subscriptions: 'save-new': 'saveAchievement' @@ -20,13 +24,10 @@ module.exports = class AchievementEditView extends RootView @achievement = new Achievement(_id: @achievementID) @achievement.saveBackups = true - @listenToOnce(@achievement, 'error', - () => - @hideLoading() - $(@$el).find('.main-content-area').children('*').not('#error-view').remove() - - @insertSubView(new ErrorView()) - ) + @achievement.once 'error', (achievement, jqxhr) => + @hideLoading() + $(@$el).find('.main-content-area').children('*').not('.breadcrumb').remove() + errors.backboneFailure arguments... @achievement.fetch() @listenToOnce(@achievement, 'sync', @buildTreema) @@ -49,17 +50,31 @@ module.exports = class AchievementEditView extends RootView @treema.build() - pushChangesToPreview: => - 'TODO' # TODO might want some intrinsic preview thing - getRenderData: (context={}) -> context = super(context) context.achievement = @achievement context.authorized = me.isAdmin() context + afterRender: -> + super(arguments...) + @pushChangesToPreview() + + pushChangesToPreview: => + $('#achievement-view').empty() + + if @treema? + for key, value of @treema.data + @achievement.set key, value + + earned = + earnedPoints: @achievement.get 'worth' + + popup = new AchievementPopup achievement: @achievement, earnedAchievement:earned, popup: false, container: $('#achievement-view') + + openSaveModal: -> - 'Maybe later' # TODO + 'Maybe later' # TODO patch patch patch saveAchievement: (e) -> @treema.endExistingEdits() @@ -75,20 +90,31 @@ module.exports = class AchievementEditView extends RootView url = "/editor/achievement/#{@achievement.get('slug') or @achievement.id}" document.location.href = url - confirmRecalculation: (e) -> + confirmRecalculation: -> renderData = 'confirmTitle': 'Are you really sure?' 'confirmBody': 'This will trigger recalculation of the achievement for all users. Are you really sure you want to go down this path?' 'confirmDecline': 'Not really' 'confirmConfirm': 'Definitely' - confirmModal = new ConfirmModal(renderData) - confirmModal.onConfirm @recalculateAchievement + confirmModal = new ConfirmModal renderData + confirmModal.on 'confirm', @recalculateAchievement + @openModalView confirmModal + + confirmDeletion: -> + renderData = + 'confirmTitle': 'Are you really sure?' + 'confirmBody': 'This will completely delete the achievement, potentially breaking a lot of stuff you don\'t want breaking. Are you entirely sure?' + 'confirmDecline': 'Not really' + 'confirmConfirm': 'Definitely' + + confirmModal = new ConfirmModal renderData + confirmModal.on 'confirm', @deleteAchievement @openModalView confirmModal recalculateAchievement: => $.ajax - data: JSON.stringify(achievements: [@achievement.get('slug') or @achievement.get('_id')]) + data: JSON.stringify(earnedAchievements: [@achievement.get('slug') or @achievement.get('_id')]) success: (data, status, jqXHR) -> noty timeout: 5000 @@ -105,3 +131,24 @@ module.exports = class AchievementEditView extends RootView url: '/admin/earned.achievement/recalculate' type: 'POST' contentType: 'application/json' + + deleteAchievement: => + console.debug 'deleting' + $.ajax + type: 'DELETE' + success: -> + noty + timeout: 5000 + text: 'Aaaand it\'s gone.' + type: 'success' + layout: 'topCenter' + _.delay -> + app.router.navigate '/editor/achievement', trigger: true + , 500 + error: (jqXHR, status, error) -> + console.error jqXHR + timeout: 5000 + text: "Deleting achievement failed with error code #{jqXHR.status}" + type: 'error' + layout: 'topCenter' + url: "/db/achievement/#{@achievement.id}" diff --git a/app/views/editor/component/AddThangComponentsModal.coffee b/app/views/editor/component/AddThangComponentsModal.coffee new file mode 100644 index 000000000..ab937ae84 --- /dev/null +++ b/app/views/editor/component/AddThangComponentsModal.coffee @@ -0,0 +1,40 @@ +ModalView = require 'views/kinds/ModalView' +template = require 'templates/editor/component/add-thang-components-modal' +CocoCollection = require 'collections/CocoCollection' +LevelComponent = require 'models/LevelComponent' + +module.exports = class UnnamedView extends ModalView + id: 'add-thang-components-modal' + template: template + plain: true + modalWidthPercent: 80 + + events: + 'click .footer button': 'onDonePressed' + + initialize: (options) -> + super() + @skipOriginals = options.skipOriginals or [] + @components = new CocoCollection([], model: LevelComponent) + @components.url = "/db/level.component?term=&project=name,system,original,version,description" + @supermodel.loadCollection(@components, 'components') + + getRenderData: -> + c = super() + c.components = (comp for comp in @components.models when not (comp.get('original') in @skipOriginals)) + c.components = _.groupBy(c.components, (comp) -> comp.get('system')) + c.nameLists = {} + for system, componentList of c.components + c.components[system] = _.sortBy(componentList, (comp) -> comp.get('name')) + c.nameLists[system] = (comp.get('name') for comp in c.components[system]).join(', ') + c.systems = _.keys(c.components) + c.systems.sort() + c + + getSelectedComponents: -> + selected = @$el.find('input[type="checkbox"]:checked') + vals = ($(el).val() for el in selected) + components = (c for c in @components.models when c.id in vals) + return components +# sparseComponents = ({original: c.get('original'), majorVersion: c.get('version').major} for c in components) +# return sparseComponents \ No newline at end of file diff --git a/app/views/editor/component/ThangComponentConfigView.coffee b/app/views/editor/component/ThangComponentConfigView.coffee index bd8be6117..39717ef6b 100644 --- a/app/views/editor/component/ThangComponentConfigView.coffee +++ b/app/views/editor/component/ThangComponentConfigView.coffee @@ -1,5 +1,5 @@ CocoView = require 'views/kinds/CocoView' -template = require 'templates/editor/components/thang-component-config-view' +template = require 'templates/editor/component/thang-component-config-view' Level = require 'models/Level' LevelComponent = require 'models/LevelComponent' @@ -48,6 +48,7 @@ module.exports = class ThangComponentConfigView extends CocoView teams: teams superteams: superteams nodeClasses: + object: ComponentConfigNode 'point2d': nodes.WorldPointNode 'viewport': nodes.WorldViewportNode 'bounds': nodes.WorldBoundsNode @@ -71,10 +72,7 @@ module.exports = class ThangComponentConfigView extends CocoView @changed = true @trigger 'changed', { component: @component, config: @data() } - undo: -> - @editThangTreema.undo() - - redo: -> - @editThangTreema.redo() - data: -> @editThangTreema.data + +class ComponentConfigNode extends TreemaObjectNode + nodeDescription: 'Component Property' \ No newline at end of file diff --git a/app/views/editor/component/ThangComponentsEditView.coffee b/app/views/editor/component/ThangComponentsEditView.coffee index 9ed2ae5a8..2459439c9 100644 --- a/app/views/editor/component/ThangComponentsEditView.coffee +++ b/app/views/editor/component/ThangComponentsEditView.coffee @@ -1,16 +1,28 @@ CocoView = require 'views/kinds/CocoView' -template = require 'templates/editor/components/thang-components-edit-view' +template = require 'templates/editor/component/thang-components-edit-view' Level = require 'models/Level' LevelComponent = require 'models/LevelComponent' LevelSystem = require 'models/LevelSystem' ComponentsCollection = require 'collections/ComponentsCollection' ThangComponentConfigView = require './ThangComponentConfigView' +AddThangComponentsModal = require './AddThangComponentsModal' +nodes = require '../level/treema_nodes' + +ThangType = require 'models/ThangType' +CocoCollection = require 'collections/CocoCollection' + +class ThangTypeSearchCollection extends CocoCollection + url: '/db/thang.type?project=original,name,version,slug,kind,components' + model: ThangType module.exports = class ThangComponentsEditView extends CocoView id: 'thang-components-edit-view' template: template + events: + 'click #add-components-button': 'onAddComponentsButtonClicked' + constructor: (options) -> super options @components = options.components or [] @@ -18,29 +30,30 @@ module.exports = class ThangComponentsEditView extends CocoView @lastComponentLength = @components.length @world = options.world @level = options.level - @callback = options.callback # TODO: Switch to 'trigger' @loadComponents(@components) - + # Need to grab the ThangTypes so that we can autocomplete items in inventory based on them. + @thangTypes = @supermodel.loadCollection(new ThangTypeSearchCollection(), 'thangs').model + loadComponents: (components) -> for componentRef in components - levelComponent = new LevelComponent() + levelComponent = new LevelComponent(componentRef) url = "/db/level.component/#{componentRef.original}/version/#{componentRef.majorVersion}" levelComponent.setURL(url) resource = @supermodel.loadModel levelComponent, 'component' + continue unless resource.isLoading @listenToOnce resource, 'loaded', -> return if @handlingChange - if @supermodel.finished() - @handlingChange = true - @onComponentsAdded() - @handlingChange = false + @handlingChange = true + @onComponentsAdded() + @handlingChange = false afterRender: -> super() return unless @supermodel.finished() - @buildExtantComponentsTreema() + @buildComponentsTreema() @addThangComponentConfigViews() - buildExtantComponentsTreema: -> + buildComponentsTreema: -> treemaOptions = supermodel: @supermodel schema: Level.schema.properties.thangs.items.properties.components @@ -49,41 +62,49 @@ module.exports = class ThangComponentsEditView extends CocoView noSortable: true nodeClasses: 'thang-components-array': ThangComponentsArrayNode + 'point2d': nodes.WorldPointNode + 'viewport': nodes.WorldViewportNode + 'bounds': nodes.WorldBoundsNode + 'radians': nodes.RadiansNode + 'team': nodes.TeamNode + 'superteam': nodes.SuperteamNode + 'meters': nodes.MetersNode + 'kilograms': nodes.KilogramsNode + 'seconds': nodes.SecondsNode + 'speed': nodes.SpeedNode + 'acceleration': nodes.AccelerationNode + 'item-thang-type': nodes.ItemThangTypeNode + + @componentsTreema = @$el.find('#thang-components-column .treema').treema treemaOptions + @componentsTreema.build() - @extantComponentsTreema = @$el.find('#extant-components-column .treema').treema treemaOptions - @extantComponentsTreema.build() - onComponentsTreemaChanged: => return if @handlingChange @handlingChange = true componentMap = {} for component in @components componentMap[component.original] = component - + newComponentsList = [] - for component in @extantComponentsTreema.data + for component in @componentsTreema.data newComponentsList.push(componentMap[component.original] or component) @components = newComponentsList - + # update the components list here @onComponentsChanged() @handlingChange = false - + onComponentsChanged: => # happens whenever the list of components changed, one way or another # * if the treema gets changed # * if components are added externally, like by a modal # * if a dependency loads and is added to the list - - # TODO: Disallow editing components in the list, otherwise this system breaks. - + if @components.length < @lastComponentLength @onComponentsRemoved() else @onComponentsAdded() - @lastComponentLength = @components.length - onComponentsRemoved: -> componentMap = {} for component in @components @@ -109,7 +130,7 @@ module.exports = class ThangComponentsEditView extends CocoView removedSomething = true break if removedSomething break unless removedSomething - + @components = _.values(componentMap) # Delete individual component config views that are no longer included. @@ -122,9 +143,10 @@ module.exports = class ThangComponentsEditView extends CocoView @reportChanges() updateComponentsList: -> - @extantComponentsTreema?.set('/', $.extend(true, [], @components)) - + @componentsTreema?.set('/', $.extend(true, [], @components)) + onComponentsAdded: -> + return unless @componentsTreema componentMap = {} for component in @components componentMap[component.original] = component @@ -135,7 +157,7 @@ module.exports = class ThangComponentsEditView extends CocoView for componentRef in _.values(componentMap) componentModel = @supermodel.getModelByOriginalAndMajorVersion( LevelComponent, componentRef.original, componentRef.majorVersion) - for dependency in componentModel.get('dependencies') or [] + for dependency in componentModel?.get('dependencies') or [] if not componentMap[dependency.original] component = @supermodel.getModelByOriginalAndMajorVersion( LevelComponent, dependency.original, dependency.majorVersion) @@ -153,11 +175,12 @@ module.exports = class ThangComponentsEditView extends CocoView componentMap[dependency.original] = dependency @components.push dependency break unless addedSomething - + # Sort the component list, reorder the component config views @updateComponentsList() @addThangComponentConfigViews() + @checkForMissingSystems() @reportChanges() addThangComponentConfigViews: -> @@ -171,7 +194,7 @@ module.exports = class ThangComponentsEditView extends CocoView # Put back config views into the DOM based on the component list ordering, # adding and registering new ones as needed. configsEl = @$el.find('#thang-component-configs') - for componentRef in @extantComponentsTreema.data + for componentRef in @componentsTreema.data subview = componentConfigViews[componentRef.original] if not subview subview = @makeThangComponentConfigView(componentRef) @@ -199,11 +222,11 @@ module.exports = class ThangComponentsEditView extends CocoView if thangComponent.original is e.component.get('original') thangComponent.config = e.config @reportChanges() - + onSelectComponent: (e, nodes) => - @extantComponentsTreema.$el.find('.dependent').removeClass('dependent') + @componentsTreema.$el.find('.dependent').removeClass('dependent') return unless nodes.length is 1 - + # find dependent components dependents = {} dependents[nodes[0].data.original] = true @@ -218,9 +241,9 @@ module.exports = class ThangComponentsEditView extends CocoView if dependents[dependency.original] dependents[otherComponentRef.original] = true componentsToCheck.push otherComponentRef.original - + # highlight them - for child in _.values(@extantComponentsTreema.childrenTreemas) + for child in _.values(@componentsTreema.childrenTreemas) if dependents[child.data.original] child.$el.addClass('dependent') @@ -230,7 +253,7 @@ module.exports = class ThangComponentsEditView extends CocoView if subview.component.get('original') is nodes[0].data.original subview.$el[0].scrollIntoView() break - + onComponentConfigChanged: (data) => @updatingFromConfig = true @selectedRow.set '/config', data if data and @configView.changed and @configView.editing @@ -240,30 +263,41 @@ module.exports = class ThangComponentsEditView extends CocoView @buildAddComponentTreema() @reportChanges() - onAddComponentEnterPressed: (node) => - # TODO: Incorporate this logic when adding components - if extantSystems - extantSystems = - (@supermodel.getModelByOriginalAndMajorVersion LevelSystem, sn.original, sn.majorVersion).attributes.name.toLowerCase() for idx, sn of @level.get('systems') - requireSystem = node.data.system.toLowerCase() + checkForMissingSystems: -> + return unless @level + extantSystems = + (@supermodel.getModelByOriginalAndMajorVersion LevelSystem, sn.original, sn.majorVersion).attributes.name.toLowerCase() for idx, sn of @level.get('systems') - if requireSystem not in extantSystems - warn_element = 'Component ' + node.data.name + ' requires system ' + requireSystem + ' which is currently not specified in this level.' + componentModels = (@supermodel.getModelByOriginal(LevelComponent, c.original) for c in @components) + componentSystems = (c.get('system') for c in componentModels when c) + + for system in componentSystems + if system not in extantSystems + s = "Component requires system #{system} which is currently not included in this level." noty({ - text: warn_element, + text: s, layout: 'bottomLeft', type: 'warning' }) reportChanges: -> - @callback?($.extend(true, [], @components)) + @lastComponentLength = @components.length + @trigger 'components-changed', $.extend(true, [], @components) - # TODO: Fix these. - undo: -> - if @configView is null or @configView?.editing is false then @extantComponentsTreema.undo() else @configView.undo() + undo: -> @componentsTreema.undo() + + redo: -> @componentsTreema.redo() + + onAddComponentsButtonClicked: -> + modal = new AddThangComponentsModal({skipOriginals: (c.original for c in @components)}) + @openModalView modal + @listenToOnce modal, 'hidden', -> + componentsToAdd = modal.getSelectedComponents() + sparseComponents = ({original: c.get('original'), majorVersion: c.get('version').major} for c in componentsToAdd) + @loadComponents(sparseComponents) + @components = @components.concat(sparseComponents) + @onComponentsChanged() - redo: -> - if @configView is null or @configView?.editing is false then @extantComponentsTreema.redo() else @configView.redo() class ThangComponentsArrayNode extends TreemaArrayNode valueClass: 'treema-thang-components-array' @@ -279,4 +313,4 @@ class ThangComponentsArrayNode extends TreemaArrayNode return -1 if a.attributes.system < b.attributes.system return 1 if a.name > b.name return -1 if a.name < b.name - return 0 \ No newline at end of file + return 0 diff --git a/app/views/editor/level/LevelEditView.coffee b/app/views/editor/level/LevelEditView.coffee index 8e489291e..bf6a3166d 100644 --- a/app/views/editor/level/LevelEditView.coffee +++ b/app/views/editor/level/LevelEditView.coffee @@ -12,9 +12,10 @@ ScriptsTabView = require './scripts/ScriptsTabView' ComponentsTabView = require './components/ComponentsTabView' SystemsTabView = require './systems/SystemsTabView' SaveLevelModal = require './modals/SaveLevelModal' -LevelForkView = require './modals/ForkLevelModal' +ForkModal = require 'views/editor/ForkModal' SaveVersionModal = require 'views/modal/SaveVersionModal' PatchesView = require 'views/editor/PatchesView' +RelatedAchievementsView = require 'views/editor/level/RelatedAchievementsView' VersionHistoryView = require './modals/LevelVersionsModal' ComponentDocsView = require 'views/docs/ComponentDocumentationView' @@ -29,10 +30,12 @@ module.exports = class LevelEditView extends RootView 'click .play-with-team-button': 'onPlayLevel' 'click .play-with-team-parent': 'onPlayLevelTeamSelect' 'click #commit-level-start-button': 'startCommittingLevel' - 'click #fork-level-start-button': 'startForkingLevel' + 'click #fork-start-button': 'startForking' 'click #level-history-button': 'showVersionHistory' 'click #undo-button': 'onUndo' + 'mouseenter #undo-button': 'showUndoDescription' 'click #redo-button': 'onRedo' + 'mouseenter #redo-button': 'showRedoDescription' 'click #patches-tab': -> @patchesView.load() 'click #components-tab': -> @subviews.editor_level_components_tab_view.refreshLevelThangsTreema @level.get('thangs') 'click #level-patch-button': 'startPatchingLevel' @@ -75,7 +78,8 @@ module.exports = class LevelEditView extends RootView @insertSubView new ScriptsTabView world: @world, supermodel: @supermodel, files: @files @insertSubView new ComponentsTabView supermodel: @supermodel @insertSubView new SystemsTabView supermodel: @supermodel - @insertSubView new ComponentDocsView() + @insertSubView new RelatedAchievementsView supermodel: @supermodel, level: @level + @insertSubView new ComponentDocsView supermodel: @supermodel Backbone.Mediator.publish 'level-loaded', level: @level @showReadOnly() if me.get('anonymous') @@ -108,10 +112,18 @@ module.exports = class LevelEditView extends RootView @childWindow.focus() onUndo: -> - @getCurrentView()?.undo?() + TreemaNode.getLastTreemaWithFocus()?.undo() onRedo: -> - @getCurrentView()?.redo?() + TreemaNode.getLastTreemaWithFocus()?.redo() + + showUndoDescription: -> + undoDescription = TreemaNode.getLastTreemaWithFocus().getUndoDescription() + @$el.find('#undo-button').attr('title', 'Undo ' + undoDescription + ' (Ctrl+Z)') + + showRedoDescription: -> + redoDescription = TreemaNode.getLastTreemaWithFocus().getRedoDescription() + @$el.find('#redo-button').attr('title', 'Redo ' + redoDescription + ' (Ctrl+Shift+Z)') getCurrentView: -> tabText = _.string.underscored $('li.active')[0]?.textContent @@ -128,9 +140,8 @@ module.exports = class LevelEditView extends RootView @openModalView new SaveLevelModal level: @level, supermodel: @supermodel Backbone.Mediator.publish 'level:view-switched', e - startForkingLevel: (e) -> - levelForkView = new LevelForkView level: @level - @openModalView levelForkView + startForking: (e) -> + @openModalView new ForkModal model: @level, editorPath: 'level' Backbone.Mediator.publish 'level:view-switched', e showVersionHistory: (e) -> diff --git a/app/views/editor/level/RelatedAchievementsView.coffee b/app/views/editor/level/RelatedAchievementsView.coffee new file mode 100644 index 000000000..e0ff97d54 --- /dev/null +++ b/app/views/editor/level/RelatedAchievementsView.coffee @@ -0,0 +1,40 @@ +CocoView = require 'views/kinds/CocoView' +template = require 'templates/editor/level/related-achievements' +RelatedAchievementsCollection = require 'collections/RelatedAchievementsCollection' +Achievement = require 'models/Achievement' +NewAchievementModal = require './modals/NewAchievementModal' +app = require 'application' + +module.exports = class RelatedAchievementsView extends CocoView + id: 'related-achievements-view' + template: template + className: 'tab-pane' + + events: + 'click #new-achievement-button': 'makeNewAchievement' + + constructor: (options) -> + super options + @level = options.level + @relatedID = @level.id + @achievements = new RelatedAchievementsCollection @relatedID + @supermodel.loadCollection @achievements, 'achievements' + + onLoaded: -> + console.debug 'related achievements loaded' + @achievements.loading = false + super() + + getRenderData: -> + c = super() + c.achievements = @achievements + c.relatedID = @relatedID + c + + onNewAchievementSaved: (achievement) -> + app.router.navigate('/editor/achievement/' + (achievement.get('slug') or achievement.id), {trigger: true}) + + makeNewAchievement: -> + modal = new NewAchievementModal model: Achievement, modelLabel: 'Achievement', level: @level + modal.once 'model-created', @onNewAchievementSaved + @openModalView modal diff --git a/app/views/editor/level/modals/ForkLevelModal.coffee b/app/views/editor/level/modals/ForkLevelModal.coffee deleted file mode 100644 index 335ffc4a1..000000000 --- a/app/views/editor/level/modals/ForkLevelModal.coffee +++ /dev/null @@ -1,45 +0,0 @@ -ModalView = require 'views/kinds/ModalView' -template = require 'templates/editor/level/fork' -forms = require 'lib/forms' -Level = require 'models/Level' - -module.exports = class ForkLevelModal extends ModalView - id: 'editor-level-fork-modal' - template: template - instant: false - modalWidthPercent: 60 - - events: - 'click #fork-level-confirm-button': 'forkLevel' - 'submit form': 'forkLevel' - - constructor: (options) -> - super options - @level = options.level - - getRenderData: (context={}) -> - context = super(context) - context.level = @level - context - - forkLevel: -> - @showLoading() - forms.clearFormAlerts(@$el) - newLevel = new Level($.extend(true, {}, @level.attributes)) - newLevel.unset '_id' - newLevel.unset 'version' - newLevel.unset 'creator' - newLevel.unset 'created' - newLevel.unset 'original' - newLevel.unset 'parent' - newLevel.set 'commitMessage', "Forked from #{@level.get('name')}" - newLevel.set 'name', @$el.find('#level-name').val() - newLevel.set 'permissions', [access: 'owner', target: me.id] - res = newLevel.save() - return unless res - res.error => - @hideLoading() - forms.applyErrorsToForm(@$el.find('form'), JSON.parse(res.responseText)) - res.success => - @hide() - application.router.navigate('editor/level/' + newLevel.get('slug'), {trigger: true}) diff --git a/app/views/editor/level/modals/NewAchievementModal.coffee b/app/views/editor/level/modals/NewAchievementModal.coffee new file mode 100644 index 000000000..a666bd239 --- /dev/null +++ b/app/views/editor/level/modals/NewAchievementModal.coffee @@ -0,0 +1,54 @@ +NewModelModal = require 'views/modal/NewModelModal' +template = require 'templates/editor/level/modal/new-achievement' +forms = require 'lib/forms' +Achievement = require 'models/Achievement' + +module.exports = class NewAchievementModal extends NewModelModal + id: 'new-achievement-modal' + template: template + plain: false + + constructor: (options) -> + super options + @level = options.level + + getRenderData: -> + c = super() + c.level = @level + console.debug 'level', c.level + c + + createQuery: -> + checked = @$el.find('[name=queryOptions]:checked') + checkedValues = ($(check).val() for check in checked) + subQueries = [] + for id in checkedValues + switch id + when 'misc-level-completion' + subQueries.push state: complete: true + else # It's a goal + q = state: goalStates: {} + q.state.goalStates[id] = {} + q.state.goalStates[id].status = 'success' + subQueries.push q + unless subQueries.length + query = {} + else if subQueries.length is 1 + query = subQueries[0] + else + query = $or: subQueries + query + + makeNewModel: -> + achievement = new Achievement + name = @$el.find('#name').val() + description = @$el.find('#description').val() + query = @createQuery() + + achievement.set 'name', name + achievement.set 'description', description + achievement.set 'query', query + achievement.set 'collection', 'level.sessions' + achievement.set 'userField', 'creator' + + achievement diff --git a/app/views/editor/level/modals/SaveLevelModal.coffee b/app/views/editor/level/modals/SaveLevelModal.coffee index 2cbf62b9c..316283ecf 100644 --- a/app/views/editor/level/modals/SaveLevelModal.coffee +++ b/app/views/editor/level/modals/SaveLevelModal.coffee @@ -47,6 +47,10 @@ module.exports = class SaveLevelModal extends SaveVersionModal shouldSaveEntity: (m) -> return false unless m.hasWriteAccess() + if not m.get('system') and m.type() is 'LevelComponent' + # Trying to debug the occasional phantom all-Components-must-be-saved bug + console.log "Should we save", m.get('system'), m.get('name'), m, "? localChanges:", m.hasLocalChanges(), "version:", m.get('version'), 'isPublished:', m.isPublished(), 'collection:', m.collection + return false return true if m.hasLocalChanges() return true if (m.get('version').major is 0 and m.get('version').minor is 0) or not m.isPublished() and not m.collection # Sometimes we have two versions: one in a search collection and one with a URL. We only save changes to the latter. diff --git a/app/views/editor/level/modals/TerrainRandomizeModal.coffee b/app/views/editor/level/modals/TerrainRandomizeModal.coffee index c9decc61c..7dc37d7c8 100644 --- a/app/views/editor/level/modals/TerrainRandomizeModal.coffee +++ b/app/views/editor/level/modals/TerrainRandomizeModal.coffee @@ -24,7 +24,7 @@ clusters = { 'margin': 1 } 'wood': { - 'thangs': ['Firewood 1', 'Firewood 2', 'Firewood 3', 'Barrel'] + 'thangs': ['Firewood 1', 'Firewood 2', 'Firewood 3'] 'margin': 1 } 'farm': { @@ -39,6 +39,18 @@ clusters = { 'thangs': ['Gargoyle', 'Rock Cluster 1', 'Rock Cluster 2', 'Rock Cluster 3'] 'margin': 1 } + 'torch': { + 'thangs': ['Torch'] + 'margin': 0 + } + 'chains': { + 'thangs': ['Chains'] + 'margin': 0 + } + 'barrel': { + 'thangs': ['Barrel'] + 'margin': 1 + } 'doors': { 'thangs': ['Dungeon Door'] 'margin': -1 @@ -55,6 +67,18 @@ clusters = { 'thangs': ['Dungeon Floor'] 'margin': -1 } + 'indoor_wall': { + 'thangs': ['Indoor Wall'] + 'margin': 2 + } + 'indoor_floor': { + 'thangs': ['Indoor Floor'] + 'margin': -1 + } + 'furniture': { + 'thangs': ['Bookshelf', 'Chair', 'Table', 'Candle', 'Treasure Chest'] + 'margin': -1 + } } presets = { @@ -63,8 +87,23 @@ presets = { 'borders':'dungeon_wall' 'borderNoise':0 'borderSize':4 + 'borderThickness':1 'floors':'dungeon_floor' 'decorations': { + 'Room': { + 'num': [1,1] + 'width': [12, 20] + 'height': [8, 16] + 'thickness': [2,2] + 'cluster': 'dungeon_wall' + } + 'Barrels': { + 'num': [1,1] + 'width': [8, 12] + 'height': [8, 12] + 'numBarrels': [4,6] + 'cluster': 'barrel' + } 'cave': { 'num':[1,1] 'width': 10 @@ -74,12 +113,30 @@ presets = { 'stone':[2,4] } } + } + } + 'indoor': { + 'type':'indoor' + 'borders':'indoor_wall' + 'borderNoise':0 + 'borderSize':4 + 'borderThickness':1 + 'floors':'indoor_floor' + 'decorations': { 'Room': { 'num': [1,1] 'width': [12, 20] 'height': [8, 16] 'thickness': [2,2] - 'cluster': 'dungeon_wall' + 'cluster': 'indoor_wall' + } + 'furniture': { + 'num':[1,2] + 'width': 15 + 'height': 15 + 'clusters': { + 'furniture':[2,4] + } } } } @@ -88,6 +145,7 @@ presets = { 'borders':'trees' 'borderNoise':1 'borderSize':0 + 'borderThickness':3 'floors':'grass_floor' 'decorations': { 'house': { @@ -120,10 +178,12 @@ presetSizes = { 'small': { 'x':80 'y':68 + 'sizeFactor':1 } 'large': { 'x':160 'y':136 + 'sizeFactor':2 } } @@ -135,7 +195,6 @@ thangSizes = { 'borderSize': { 'x':4 'y':4 - 'thickness':3 } } @@ -185,7 +244,8 @@ module.exports = class TerrainRandomizeModal extends ModalView randomizeBorder: (preset, presetSize, noiseFactor=1) -> for i in _.range(0, presetSize.x, thangSizes.borderSize.x) - for j in _.range(thangSizes.borderSize.thickness) + for j in _.range(preset.borderThickness) + # Bottom wall while not @addThang { 'id': @getRandomThang(clusters[preset.borders].thangs) 'pos': { @@ -195,6 +255,8 @@ module.exports = class TerrainRandomizeModal extends ModalView 'margin': clusters[preset.borders].margin } continue + + # Top wall while not @addThang { 'id': @getRandomThang(clusters[preset.borders].thangs) 'pos': { @@ -205,8 +267,38 @@ module.exports = class TerrainRandomizeModal extends ModalView } continue + # Double wall on top + if preset.type is 'dungeon' + @addThang { + 'id': @getRandomThang(clusters[preset.borders].thangs) + 'pos': { + 'x': i + preset.borderSize/2 + 'y': presetSize.y - 3 * preset.borderSize/2 + } + 'margin': clusters[preset.borders].margin + } + if ( i / preset.borderSize ) % 2 and i isnt presetSize.x - thangSizes.borderSize.x + @addThang { + 'id': @getRandomThang(clusters['torch'].thangs) + 'pos': { + 'x': i + preset.borderSize + 'y': presetSize.y - preset.borderSize + } + 'margin': clusters['torch'].margin + } + else if ( i / preset.borderSize ) % 2 is 0 and i and _.random(100) < 30 + @addThang { + 'id': @getRandomThang(clusters['chains'].thangs) + 'pos': { + 'x': i + preset.borderSize + 'y': presetSize.y - preset.borderSize + } + 'margin': clusters['chains'].margin + } + for i in _.range(0, presetSize.y, thangSizes.borderSize.y) - for j in _.range(3) + for j in _.range(preset.borderThickness) + # Left wall while not @addThang { 'id': @getRandomThang(clusters[preset.borders].thangs) 'pos': { @@ -216,6 +308,8 @@ module.exports = class TerrainRandomizeModal extends ModalView 'margin': clusters[preset.borders].margin } continue + + # Right wall while not @addThang { 'id': @getRandomThang(clusters[preset.borders].thangs) 'pos': { @@ -227,9 +321,8 @@ module.exports = class TerrainRandomizeModal extends ModalView continue randomizeDecorations: (preset, presetSize)-> - if presetSize is presetSizes['small'] then sizeFactor = 1 else sizeFactor = 2 for name, decoration of preset.decorations - for num in _.range(sizeFactor * _.random(decoration.num[0], decoration.num[1])) + for num in _.range(presetSize.sizeFactor * _.random(decoration.num[0], decoration.num[1])) if @['build'+name] isnt undefined @['build'+name](preset, presetSize, decoration) continue @@ -255,23 +348,22 @@ module.exports = class TerrainRandomizeModal extends ModalView continue buildRoom: (preset, presetSize, room) -> - if presetSize is presetSizes['small'] then sizeFactor = 1 else sizeFactor = 2 while true rect = { - 'width':sizeFactor * (room.width[0] + preset.borderSize * _.random(0, (room.width[1] - room.width[0])/preset.borderSize)) - 'height':sizeFactor * (room.height[0] + preset.borderSize * _.random(0, (room.height[1] - room.height[0])/preset.borderSize)) + 'width':presetSize.sizeFactor * (room.width[0] + preset.borderSize * _.random(0, (room.width[1] - room.width[0])/preset.borderSize)) + 'height':presetSize.sizeFactor * (room.height[0] + preset.borderSize * _.random(0, (room.height[1] - room.height[0])/preset.borderSize)) } roomThickness = _.random(room.thickness[0], room.thickness[1]) - rect.x = _.random(rect.width/2 + preset.borderSize * (roomThickness+1), presetSize.x - rect.width/2 - preset.borderSize * (roomThickness+1)) - rect.y = _.random(rect.height/2 + preset.borderSize * (roomThickness+1), presetSize.y - rect.height/2 - preset.borderSize * (roomThickness+1)) + rect.x = _.random(rect.width/2 + preset.borderSize * (roomThickness+1.5), presetSize.x - rect.width/2 - preset.borderSize * (roomThickness+1.5)) + rect.y = _.random(rect.height/2 + preset.borderSize * (roomThickness+2.5), presetSize.y - rect.height/2 - preset.borderSize * (roomThickness+3.5)) # Snap room walls to the wall grid. rect.x = Math.round((rect.x - preset.borderSize / 2) / preset.borderSize) * preset.borderSize + preset.borderSize / 2 rect.y = Math.round((rect.y - preset.borderSize / 2) / preset.borderSize) * preset.borderSize + preset.borderSize / 2 break if @addRect { 'x': rect.x 'y': rect.y - 'width': rect.width + 2 * roomThickness * preset.borderSize - 'height': rect.height + 2 * roomThickness * preset.borderSize + 'width': rect.width + 2.5 * roomThickness * preset.borderSize + 'height': rect.height + 2.5 * roomThickness * preset.borderSize } xRange = _.range(rect.x - rect.width/2 + preset.borderSize, rect.x + rect.width/2, preset.borderSize) @@ -282,6 +374,7 @@ module.exports = class TerrainRandomizeModal extends ModalView for t in _.range(0, roomThickness+1) for i in _.range(rect.x - rect.width/2 - (t-1) * preset.borderSize, rect.x + rect.width/2 + t * preset.borderSize, preset.borderSize) + # Bottom wall thang = { 'id': @getRandomThang(clusters[room.cluster].thangs) 'pos': { @@ -295,6 +388,18 @@ module.exports = class TerrainRandomizeModal extends ModalView thang.pos.y -= preset.borderSize/3 @addThang thang unless i is bottomDoorX and t isnt roomThickness and bottomDoor + if t is roomThickness and i isnt rect.x - rect.width/2 - (t-1) * preset.borderSize and preset.type is 'dungeon' + if ( i isnt bottomDoorX and i isnt bottomDoorX + preset.borderSize ) or not bottomDoor + @addThang { + 'id': @getRandomThang(clusters['torch'].thangs) + 'pos': { + 'x': thang.pos.x - preset.borderSize / 2 + 'y': thang.pos.y + preset.borderSize / 2 + } + 'margin': clusters['torch'].margin + } + + # Top wall thang = { 'id': @getRandomThang(clusters[room.cluster].thangs) 'pos': { @@ -310,6 +415,7 @@ module.exports = class TerrainRandomizeModal extends ModalView for t in _.range(0, roomThickness) for i in _.range(rect.y - rect.height/2 - t * preset.borderSize, rect.y + rect.height/2 + (t+1) * preset.borderSize, preset.borderSize) + # Left wall @addThang { 'id': @getRandomThang(clusters[room.cluster].thangs) 'pos': { @@ -319,6 +425,7 @@ module.exports = class TerrainRandomizeModal extends ModalView 'margin': clusters[room.cluster].margin } + # Right wall @addThang { 'id': @getRandomThang(clusters[room.cluster].thangs) 'pos': { @@ -328,6 +435,35 @@ module.exports = class TerrainRandomizeModal extends ModalView 'margin': clusters[room.cluster].margin } + buildBarrels: (preset, presetSize, decoration) -> + rect = { + 'width':presetSize.sizeFactor * ( _.random( decoration.width[0], decoration.width[1] ) ) + 'height':presetSize.sizeFactor * ( _.random( decoration.height[0], decoration.height[1] ) ) + } + x = [ rect.width/2 + preset.borderSize , presetSize.x - rect.width/2 - preset.borderSize ] + y = [ rect.height/2 + preset.borderSize , presetSize.y - rect.height/2 - 2 * preset.borderSize ] + + for i in x + for j in y + if _.random(100) < 40 + rect = { + 'x': i + 'y': j + 'width': rect.width + 'height': rect.height + } + if @addRect rect + for num in _.range( _.random( decoration.numBarrels[0], decoration.numBarrels[1] ) ) + while not @addThang { + 'id': @getRandomThang(clusters[decoration.cluster].thangs) + 'pos': { + 'x': _.random(rect.x - rect.width/2, rect.x + rect.width/2) + 'y': _.random(rect.y - rect.height/2, rect.y + rect.height/2) + } + 'margin': clusters[decoration.cluster].margin + } + continue + addThang: (thang) -> if @falseCount > 100 console.log 'infinite loop', thang @@ -348,7 +484,7 @@ module.exports = class TerrainRandomizeModal extends ModalView @falseCount = 0 return true for existingRect in @rects - if Math.abs(existingRect.x - rect.x) < rect.width/2 + existingRect.width/2 and Math.abs(existingRect.y - rect.y) < rect.height/2 + existingRect.height/2 + if Math.abs(existingRect.x - rect.x) <= rect.width/2 + existingRect.width/2 and Math.abs(existingRect.y - rect.y) <= rect.height/2 + existingRect.height/2 @falseCount++ return false @rects.push rect diff --git a/app/views/editor/level/scripts/ScriptsTabView.coffee b/app/views/editor/level/scripts/ScriptsTabView.coffee index a53b2c383..cf412a649 100644 --- a/app/views/editor/level/scripts/ScriptsTabView.coffee +++ b/app/views/editor/level/scripts/ScriptsTabView.coffee @@ -3,6 +3,7 @@ template = require 'templates/editor/level/scripts_tab' Level = require 'models/Level' Surface = require 'lib/surface/Surface' nodes = require './../treema_nodes' +defaultScripts = require 'lib/DefaultScripts' module.exports = class ScriptsTabView extends CocoView id: 'editor-level-scripts-tab-view' @@ -22,13 +23,18 @@ module.exports = class ScriptsTabView extends CocoView @level = e.level @dimensions = @level.dimensions() scripts = $.extend(true, [], @level.get('scripts') ? []) + if scripts.length is 0 + scripts = $.extend(true, [], defaultScripts) treemaOptions = schema: Level.schema.properties.scripts data: scripts callbacks: change: @onScriptsChanged select: @onScriptSelected + addChild: @onNewScriptAdded + removeChild: @onScriptDeleted nodeClasses: + array: ScriptsNode object: ScriptNode view: @ @scriptsTreema = @$el.find('#scripts-treema').treema treemaOptions @@ -39,23 +45,7 @@ module.exports = class ScriptsTabView extends CocoView onScriptsChanged: (e) => @level.set 'scripts', @scriptsTreema.data - lastAction = @scriptsTreema.trackedActions[@scriptsTreema.trackedActions.length - 1] - return unless lastAction - if lastAction.action is 'insert' and lastAction.parentPath is '/' - newScript = @scriptsTreema.get lastAction.path - if newScript.id is undefined - @scriptsTreema.set lastAction.path+'/id', 'Script-' + @scriptsTreema.data.length - @scriptTreema.refreshDisplay() - - if lastAction.action is 'delete' and lastAction.parentPath[0] is '/' - for key, treema of @scriptsTreema.childrenTreemas - key = parseInt(key) - if /Script-[0-9]*/.test treema.data.id - existingKey = parseInt(treema.data.id.substr(7)) - if existingKey isnt key+1 - treema.set 'id', 'Script-' + (key+1) - onScriptSelected: (e, selected) => selected = if selected.length > 1 then selected[0].getLastSelectedTreema() else selected[0] unless selected @@ -78,6 +68,7 @@ module.exports = class ScriptsTabView extends CocoView callbacks: change: @onScriptChanged nodeClasses: + object: PropertiesNode 'event-value-chain': EventPropsNode 'event-prereqs': EventPrereqsNode 'event-prereq': EventPrereqNode @@ -99,14 +90,33 @@ module.exports = class ScriptsTabView extends CocoView getThangIDs: -> (t.id for t in @level.get('thangs') when t.id isnt 'Interface') + onNewScriptAdded: (scriptNode) => + return unless scriptNode + if scriptNode.data.id is undefined + scriptNode.disableTracking() + scriptNode.set '/id', 'Script-' + @scriptsTreema.data.length + scriptNode.enableTracking() + + onScriptDeleted: => + for key, treema of @scriptsTreema.childrenTreemas + key = parseInt(key) + treema.disableTracking() + if /Script-[0-9]*/.test treema.data.id + existingKey = parseInt(treema.data.id.substr(7)) + if existingKey isnt key+1 + treema.set 'id', 'Script-' + (key+1) + treema.enableTracking() + onScriptChanged: => @scriptsTreema.set(@selectedScriptPath, @scriptTreema.data) - undo: -> - @scriptsTreema.undo() if @scriptTreema.undo() is undefined - - redo: -> - @scriptsTreema.redo() if @scriptTreema.redo() is undefined +class ScriptsNode extends TreemaArrayNode + nodeDescription: 'Script' + addNewChild: -> + newTreema = super() + if @callbacks.addChild + @callbacks.addChild newTreema + newTreema class ScriptNode extends TreemaObjectNode valueClass: 'treema-script' @@ -120,6 +130,12 @@ class ScriptNode extends TreemaObjectNode @tabToCurrentScript() e.preventDefault() + onDeletePressed: (e) -> + returnVal = super(e) + if @callbacks.removeChild + @callbacks.removeChild() + returnVal + onRightArrowPressed: -> @tabToCurrentScript() @@ -130,6 +146,9 @@ class ScriptNode extends TreemaObjectNode return unless firstRow? firstRow.select() +class PropertiesNode extends TreemaObjectNode + nodeDescription: 'Script Property' + class EventPropsNode extends TreemaNode.nodeMap.string valueClass: 'treema-event-props' diff --git a/app/views/editor/level/settings/SettingsTabView.coffee b/app/views/editor/level/settings/SettingsTabView.coffee index 5133dd6ba..cf2c57196 100644 --- a/app/views/editor/level/settings/SettingsTabView.coffee +++ b/app/views/editor/level/settings/SettingsTabView.coffee @@ -39,6 +39,7 @@ module.exports = class SettingsTabView extends CocoView callbacks: {change: @onSettingsChanged} thangIDs: thangIDs nodeClasses: + object: SettingsNode thang: nodes.ThangNode @settingsTreema = @$el.find('#settings-treema').treema treemaOptions @@ -54,8 +55,5 @@ module.exports = class SettingsTabView extends CocoView continue if @settingsTreema.data[key] is undefined @level.set key, @settingsTreema.data[key] - undo: -> - @settingsTreema.undo() - - redo: -> - @settingsTreema.redo() +class SettingsNode extends TreemaObjectNode + nodeDescription: 'Settings' \ No newline at end of file diff --git a/app/views/editor/level/systems/LevelSystemEditView.coffee b/app/views/editor/level/systems/LevelSystemEditView.coffee index 89c52faae..b1bcf8f67 100644 --- a/app/views/editor/level/systems/LevelSystemEditView.coffee +++ b/app/views/editor/level/systems/LevelSystemEditView.coffee @@ -115,18 +115,6 @@ module.exports = class LevelSystemEditView extends CocoView @levelSystem.watch(button.find('.watch').is(':visible')) button.find('> span').toggleClass('secret') - undo: -> - if @$el.find('li.active > a#system-config-schema-tab') - @configSchemaTreema.undo() - if @$el.find('li.active > a#system-settings-tab') - @systemSettingsTreema.undo() - - redo: -> - if @$el.find('li.active > a#system-config-schema-tab') - @configSchemaTreema.redo() - if @$el.find('li.active > a#system-settings-tab') - @systemSettingsTreema.redo() - destroy: -> @editor?.destroy() super() diff --git a/app/views/editor/level/systems/SystemsTabView.coffee b/app/views/editor/level/systems/SystemsTabView.coffee index df5908aa7..89fa16bf1 100644 --- a/app/views/editor/level/systems/SystemsTabView.coffee +++ b/app/views/editor/level/systems/SystemsTabView.coffee @@ -125,13 +125,6 @@ module.exports = class SystemsTabView extends CocoView {original: '528114e60268d018e300001a', majorVersion: 0} # UI {original: '528114040268d018e3000011', majorVersion: 0} # Physics ] - undo: -> - return unless @levelSystemEditView - @levelSystemEditView.undo() - - redo: -> - return unless @levelSystemEditView - @levelSystemEditView.redo() class LevelSystemNode extends TreemaObjectNode valueClass: 'treema-level-system' diff --git a/app/views/editor/level/thangs/LevelThangEditView.coffee b/app/views/editor/level/thangs/LevelThangEditView.coffee index bb551b41b..7ed5dce9e 100644 --- a/app/views/editor/level/thangs/LevelThangEditView.coffee +++ b/app/views/editor/level/thangs/LevelThangEditView.coffee @@ -1,5 +1,5 @@ CocoView = require 'views/kinds/CocoView' -template = require 'templates/editor/level/thang/edit' +template = require 'templates/editor/level/thang/level-thang-edit-view' ThangComponentsEditView = require 'views/editor/component/ThangComponentsEditView' ThangType = require 'models/ThangType' @@ -10,7 +10,7 @@ module.exports = class LevelThangEditView extends CocoView ThangType editor view. ### - id: 'editor-level-thang-edit' + id: 'level-thang-edit-view' template: template events: @@ -41,9 +41,9 @@ module.exports = class LevelThangEditView extends CocoView supermodel: @supermodel level: @level world: @world - callback: @onComponentsChanged @thangComponentEditView = new ThangComponentsEditView options + @listenTo @thangComponentEditView, 'components-changed', @onComponentsChanged @insertSubView @thangComponentEditView thangTypeNames = (m.get('name') for m in @supermodel.getModels ThangType) input = @$el.find('#thang-type-link input').autocomplete(source: thangTypeNames, minLength: 0, delay: 0, autoFocus: true) @@ -92,11 +92,3 @@ module.exports = class LevelThangEditView extends CocoView onComponentsChanged: (components) => @thangData.components = components @saveThang() - - undo: -> - return unless @thangComponentEditView - @thangComponentEditView.undo() - - redo: -> - return unless @thangComponentEditView - @thangComponentEditView.redo() diff --git a/app/views/editor/level/thangs/ThangsTabView.coffee b/app/views/editor/level/thangs/ThangsTabView.coffee index da24cbd0a..5bf39f4e4 100644 --- a/app/views/editor/level/thangs/ThangsTabView.coffee +++ b/app/views/editor/level/thangs/ThangsTabView.coffee @@ -58,8 +58,8 @@ module.exports = class ThangsTabView extends CocoView 'delete, del, backspace': 'deleteSelectedExtantThang' 'left': -> @moveAddThangSelection -1 'right': -> @moveAddThangSelection 1 - 'ctrl+z': 'undo' - 'ctrl+shift+z': 'redo' + 'ctrl+z, ⌘+z': 'undo' + 'ctrl+shift+z, ⌘+shift+z': 'redo' constructor: (options) -> super options @@ -106,6 +106,11 @@ module.exports = class ThangsTabView extends CocoView else $('#thangs-list').height(oldHeight - thangsHeaderHeight - 80) + undo: (e) -> + if not @editThangView then @thangsTreema.undo() else @editThangView.undo() + + redo: (e) -> + if not @editThangView then @thangsTreema.redo() else @editThangView.redo() afterRender: -> super() @@ -158,7 +163,7 @@ module.exports = class ThangsTabView extends CocoView oldHeight = $('#thangs-list').height() $('#thangs-list').height(oldHeight - thangsHeaderHeight) if data.thangs.length - @$el.find('#randomize-button').hide() + @$el.find('#randomize-button').hide() initSurface: -> surfaceCanvas = $('canvas#surface', @$el) @@ -436,7 +441,7 @@ module.exports = class ThangsTabView extends CocoView else # Mediator event window.thangsTreema = @thangsTreema thangData = @thangsTreema.get "id=#{e.thangID}" - @editThangView = new LevelThangEditView thangData: thangData, supermodel: @supermodel, level: @level, world: @world + @editThangView = new LevelThangEditView thangData: thangData, level: @level, world: @world @insertSubView @editThangView @$el.find('.thangs-column').hide() Backbone.Mediator.publish 'level:view-switched', e @@ -479,14 +484,18 @@ module.exports = class ThangsTabView extends CocoView $('#add-thangs-column').toggle() @onWindowResize e - undo: (e) -> - if not @editThangView then @thangsTreema.undo() else @editThangView.undo() - - redo: (e) -> - if not @editThangView then @thangsTreema.redo() else @editThangView.redo() - class ThangsNode extends TreemaNode.nodeMap.array valueClass: 'treema-array-replacement' + nodeDescription: 'Thang' + + getTrackedActionDescription: (trackedAction) -> + trackedActionDescription = super(trackedAction) + if trackedActionDescription is 'Edit ' + @nodeDescription + path = trackedAction.path.split '/' + if path[path.length-1] is 'pos' + trackedActionDescription = 'Move Thang' + trackedActionDescription + getChildren: -> children = super(arguments...) # TODO: add some filtering to only work with certain types of units at a time @@ -516,4 +525,4 @@ class ThangNode extends TreemaObjectNode @buildValueForDisplaySimply valEl, s onEnterPressed: -> - Backbone.Mediator.publish 'edit-level-thang', levelThang: @data.id + Backbone.Mediator.publish 'edit-level-thang', thangID: @data.id diff --git a/app/views/editor/thang/ThangTypeEditView.coffee b/app/views/editor/thang/ThangTypeEditView.coffee index 4d6edefbe..4ddeadecb 100644 --- a/app/views/editor/thang/ThangTypeEditView.coffee +++ b/app/views/editor/thang/ThangTypeEditView.coffee @@ -10,8 +10,10 @@ ThangComponentsEditView = require 'views/editor/component/ThangComponentsEditVie ThangTypeVersionsModal = require './ThangTypeVersionsModal' ThangTypeColorsTabView = require './ThangTypeColorsTabView' PatchesView = require 'views/editor/PatchesView' +ForkModal = require 'views/editor/ForkModal' SaveVersionModal = require 'views/modal/SaveVersionModal' template = require 'templates/editor/thang/thang-type-edit-view' +storage = require 'lib/storage' CENTER = {x: 200, y: 300} @@ -35,8 +37,12 @@ module.exports = class ThangTypeEditView extends RootView 'click #marker-button': 'toggleDots' 'click #end-button': 'endAnimation' 'click #history-button': 'showVersionHistory' + 'click #fork-start-button': 'startForking' 'click #save-button': 'openSaveModal' 'click #patches-tab': -> @patchesView.load() + 'click .play-with-level-button': 'onPlayLevel' + 'click .play-with-level-parent': 'onPlayLevelSelect' + 'keyup .play-with-level-input': 'onPlayLevelKeyUp' subscriptions: 'save-new-version': 'saveNewThangType' @@ -58,6 +64,7 @@ module.exports = class ThangTypeEditView extends RootView context.thangType = @thangType context.animations = @getAnimationNames() context.authorized = not me.get('anonymous') + context.recentlyPlayedLevels = storage.load('recently-played-levels') ? ['items'] context getAnimationNames: -> @@ -81,8 +88,9 @@ module.exports = class ThangTypeEditView extends RootView options = components: @thangType.get('components') ? [] supermodel: @supermodel - callback: @onComponentsChanged + @thangComponentEditView = new ThangComponentsEditView options + @listenTo @thangComponentEditView, 'components-changed', @onComponentsChanged @insertSubView @thangComponentEditView onComponentsChanged: (components) => @@ -400,12 +408,46 @@ module.exports = class ThangTypeEditView extends RootView @showingSelectedNode = false showVersionHistory: (e) -> - versionHistoryModal = new ThangTypeVersionsModal thangType: @thangType, @thangTypeID - @openModalView versionHistoryModal - Backbone.Mediator.publish 'level:view-switched', e + @openModalView new ThangTypeVersionsModal thangType: @thangType, @thangTypeID openSaveModal: -> - @openModalView(new SaveVersionModal({model: @thangType})) + @openModalView new SaveVersionModal model: @thangType + + startForking: (e) -> + @openModalView new ForkModal model: @thangType, editorPath: 'thang' + + onPlayLevelSelect: (e) -> + if @childWindow and not @childWindow.closed + # We already have a child window open, so we don't need to ask for a level; we'll use its existing level. + e.stopImmediatePropagation() + @onPlayLevel e + _.defer -> $('.play-with-level-input').focus() + + onPlayLevelKeyUp: (e) -> + return unless e.keyCode is 13 # return + input = @$el.find('.play-with-level-input') + input.parents('.dropdown').find('.play-with-level-parent').dropdown('toggle') + level = _.string.slugify input.val() + return unless level + @onPlayLevel null, level + recentlyPlayedLevels = storage.load('recently-played-levels') ? [] + recentlyPlayedLevels.push level + storage.save 'recently-played-levels', recentlyPlayedLevels + + onPlayLevel: (e, level=null) -> + level ?= $(e.target).data('level') + level = _.string.slugify level + if @childWindow and not @childWindow.closed + # Reset the LevelView's world, but leave the rest of the state alone + @childWindow.Backbone.Mediator.publish 'level-reload-thang-type', thangType: @thangType + else + # Create a new Window with a blank LevelView + scratchLevelID = level + '?dev=true' + if me.get('name') is 'Nick' + @childWindow = window.open("/play/level/#{scratchLevelID}", 'child_window', 'width=2560,height=1080,left=0,top=-1600,location=1,menubar=1,scrollbars=1,status=0,titlebar=1,toolbar=1', true) + else + @childWindow = window.open("/play/level/#{scratchLevelID}", 'child_window', 'width=1024,height=560,left=10,top=10,location=0,menubar=0,scrollbars=0,status=0,titlebar=0,toolbar=0', true) + @childWindow.focus() destroy: -> @camera?.destroy() diff --git a/app/views/game-menu/ChooseHeroView.coffee b/app/views/game-menu/ChooseHeroView.coffee index 7699be471..8568877e9 100644 --- a/app/views/game-menu/ChooseHeroView.coffee +++ b/app/views/game-menu/ChooseHeroView.coffee @@ -13,6 +13,7 @@ module.exports = class ChooseHeroView extends CocoView getRenderData: (context={}) -> context = super(context) + context.showDevBits = @options.showDevBits context afterRender: -> diff --git a/app/views/game-menu/GameMenuModal.coffee b/app/views/game-menu/GameMenuModal.coffee index 18b000857..cfb49a4db 100644 --- a/app/views/game-menu/GameMenuModal.coffee +++ b/app/views/game-menu/GameMenuModal.coffee @@ -14,17 +14,22 @@ module.exports = class GameMenuModal extends ModalView modalWidthPercent: 95 id: 'game-menu-modal' + constructor: (options) -> + super options + @options.showDevBits = me.isAdmin() or /https?:\/\/localhost/.test(window.location.href) + events: 'change input.select': 'onSelectionChanged' getRenderData: (context={}) -> context = super(context) + context.showDevBits = @options.showDevBits context afterRender: -> super() @insertSubView new submenuView @options for submenuView in submenuViews - @subviews.inventory_view.$el.addClass 'active' + (if @options.showDevBits then @subviews.inventory_view else @subviews.choose_hero_view).$el.addClass 'active' onHidden: -> subview.onHidden?() for subviewKey, subview of @subviews diff --git a/app/views/game-menu/InventoryView.coffee b/app/views/game-menu/InventoryView.coffee index f1b5ec5bf..c327f9271 100644 --- a/app/views/game-menu/InventoryView.coffee +++ b/app/views/game-menu/InventoryView.coffee @@ -2,15 +2,197 @@ CocoView = require 'views/kinds/CocoView' template = require 'templates/game-menu/inventory-view' {me} = require 'lib/auth' ThangType = require 'models/ThangType' +CocoCollection = require 'collections/CocoCollection' +ItemView = require './ItemView' + +DEFAULT_EQUIPMENT = { + 'right-hand': '53e21249b82921000051ce11' + 'feet':'53e214f153457600003e3eab' + 'eyes': '53e2167653457600003e3eb3' + 'left-hand': '53e22aa153457600003e3ef5' +} module.exports = class InventoryView extends CocoView id: 'inventory-view' className: 'tab-pane' template: template + slots: ["head","eyes","neck","torso","wrists","gloves","left-ring","right-ring","right-hand","left-hand","waist","feet","spellbook","programming-book","pet","minion","misc-0","misc-1","misc-2","misc-3","misc-4"] + + events: + 'click .item-slot': 'onItemSlotClick' + 'click #available-equipment .list-group-item': 'onAvailableItemClick' + 'dblclick #available-equipment .list-group-item': 'onAvailableItemDoubleClick' + 'dblclick .item-slot .item-view': 'onEquippedItemDoubleClick' + + shortcuts: + 'esc': 'clearSelection' + + initialize: (options) -> + super(arguments...) + @items = new CocoCollection([], { model: ThangType }) + @equipment = options.equipment or DEFAULT_EQUIPMENT + @items.url = '/db/thang.type?view=items&project=name,description,components,original' + @supermodel.loadCollection(@items, 'items') + + onLoaded: -> + super() getRenderData: (context={}) -> context = super(context) + context.equipped = _.values(@equipment) + context.items = @items.models + + for item in @items.models + item.classes = item.getAllowedSlots() + item.classes.push 'equipped' if item.get('original') in context.equipped + + context.slots = @slots + context.equipment = _.clone @equipment + for slot, itemOriginal of context.equipment + item = _.find @items.models, (item) -> item.get('original') is itemOriginal + context.equipment[slot] = item context afterRender: -> super() + return unless @supermodel.finished() + + keys = (item.id for item in @items.models) + itemMap = _.zipObject keys, @items.models + + # Fill in equipped items + for slottedItemStub in @$el.find('.replace-me') + itemID = $(slottedItemStub).data('item-id') + item = itemMap[itemID] + itemView = new ItemView({item:item, includes:{name:true}}) + itemView.render() + $(slottedItemStub).replaceWith(itemView.$el) + @registerSubView(itemView) + + for availableItemEl in @$el.find('#available-equipment .list-group-item') + itemID = $(availableItemEl).data('item-id') + item = itemMap[itemID] + itemView = new ItemView({item:item, includes:{name:true}}) + itemView.render() + $(availableItemEl).append(itemView.$el) + @registerSubView(itemView) + + @delegateEvents() + + clearSelection: -> + @$el.find('.panel-info').removeClass('panel-info') + @$el.find('.list-group-item').removeClass('active') + @onSelectionChanged() + + onItemSlotClick: (e) -> + slot = $(e.target).closest('.panel') + wasActive = slot.hasClass('panel-info') + @$el.find('#equipped .panel').removeClass('panel-info') + @$el.find('#available-equipment .list-group-item').removeClass('active') if slot.hasClass('disabled') + slot.addClass('panel-info') # unless wasActive + @onSelectionChanged() + + onAvailableItemClick: (e) -> + itemEl = $(e.target).closest('.list-group-item') + @$el.find('#available-equipment .list-group-item').removeClass('active') + itemEl.addClass('active') + @onSelectionChanged() + + onAvailableItemDoubleClick: -> + slot = @$el.find('#equipped .item-slot.panel-info') + slot = $('.panel:not(.disabled):first') if not slot.length + @unequipItemFromSlot(slot) + @equipSelectedItemToSlot(slot) + @onSelectionChanged() + + onEquippedItemDoubleClick: (e) -> + slot = $(e.target).closest('.item-slot') + @unequipItemFromSlot(slot) + @onSelectionChanged() + + unequipItemFromSlot: (slot) -> + itemIDToUnequip = slot.find('.item-view').data('item-id') + return unless itemIDToUnequip + slot.find('.item-view').detach() + for el in @$el.find('#available-equipment .list-group-item') + itemID = $(el).find('.item-view').data('item-id') + if itemID is itemIDToUnequip + $(el).removeClass('equipped') + + equipSelectedItemToSlot: (slot) -> + selectedItemContainer = @$el.find('#available-equipment .list-group-item.active') + newItemHTML = selectedItemContainer.html() + @$el.find('#available-equipment .list-group-item.active').addClass('equipped') + container = slot.find('.panel-body') + container.html(newItemHTML) + container.find('.item-view').data('item-id', selectedItemContainer.find('.item-view').data('item-id')) + @$el.find('.list-group-item').removeClass('active') + + onSelectionChanged: -> + @$el.find('.item-slot').show() + + selectedSlot = @$el.find('.panel.panel-info') + selectedItem = @$el.find('#available-equipment .list-group-item.active') + + if selectedSlot.length + @$el.find('#available-equipment .list-group-item').hide() + @$el.find("#available-equipment .list-group-item.#{selectedSlot.data('slot')}").show() + + selectedSlotItemID = selectedSlot.find('.item-view').data('item-id') + if selectedSlotItemID + item = _.find @items.models, {id:selectedSlotItemID} + + if not @selectedEquippedItemView + @selectedEquippedItemView = new ItemView({ + item: item, includes: {name: true, stats: true}}) + @insertSubView(@selectedEquippedItemView, @$el.find('#selected-equipped-item .item-view-stub')) + + else + @selectedEquippedItemView.$el.show() + @selectedEquippedItemView.item = item + @selectedEquippedItemView.render() + + else + @selectedEquippedItemView?.$el.hide() + + else + @$el.find('#available-equipment .list-group-item').show() + @$el.find('#available-equipment .list-group-item.equipped').hide() + + @$el.find('.item-slot').removeClass('disabled') + if selectedItem.length + item = _.find @items.models, {id:selectedItem.find('.item-view').data('item-id')} + + # update which slots are enabled + allowedSlots = item.getAllowedSlots() + for slotEl in @$el.find('.item-slot') + slotName = $(slotEl).data('slot') + if slotName not in allowedSlots + $(slotEl).addClass('disabled') + + # updated selected item view + if not @selectedAvailableItemView + @selectedAvailableItemView = new ItemView({ + item: item, includes: {name: true, stats: true}}) + @insertSubView(@selectedAvailableItemView, @$el.find('#selected-available-item .item-view-stub')) + + else + @selectedAvailableItemView.$el.show() + @selectedAvailableItemView.item = item + @selectedAvailableItemView.render() + + else + @selectedAvailableItemView?.$el.hide() + + @delegateEvents() + + getCurrentEquipmentConfig: -> + config = {} + for slot in @$el.find('.item-slot') + slotName = $(slot).data('slot') + slotItemID = $(slot).find('.item-view').data('item-id') + continue unless slotItemID + item = _.find @items.models, {id:slotItemID} + config[slotName] = item.get('original') + + config \ No newline at end of file diff --git a/app/views/game-menu/ItemView.coffee b/app/views/game-menu/ItemView.coffee new file mode 100644 index 000000000..8ff1b3612 --- /dev/null +++ b/app/views/game-menu/ItemView.coffee @@ -0,0 +1,21 @@ +CocoView = require 'views/kinds/CocoView' +template = require 'templates/game-menu/item-view' + +module.exports = class ItemView extends CocoView + className: 'item-view' + + template: template + + initialize: (options) -> + super(arguments...) + @item = options.item + @includes = options.includes or {} + + getRenderData: -> + c = super() + c.item = @item + c.includes = @includes + c + + afterRender: -> + @$el.data('item-id', @item.id) diff --git a/app/views/game-menu/OptionsView.coffee b/app/views/game-menu/OptionsView.coffee index 8654554ef..e1bd2c53e 100644 --- a/app/views/game-menu/OptionsView.coffee +++ b/app/views/game-menu/OptionsView.coffee @@ -48,6 +48,20 @@ module.exports = class OptionsView extends CocoView afterRender: -> super() + @volumeSlider = @$el.find('#option-volume').slider(animate: 'fast', min: 0, max: 1, step: 0.05) + @volumeSlider.slider('value', me.get('volume')) + @volumeSlider.on('slide', @onVolumeSliderChange) + @volumeSlider.on('slidechange', @onVolumeSliderChange) + + destroy: -> + @volumeSlider?.slider?('destroy') + super() + + onVolumeSliderChange: (e) => + volume = @volumeSlider.slider('value') + me.set 'volume', volume + @$el.find('#option-volume-value').text (volume * 100).toFixed(0) + '%' + Backbone.Mediator.publish 'level-set-volume', volume: volume onHidden: -> if @playerName and @playerName isnt me.get('name') diff --git a/app/views/kinds/RootView.coffee b/app/views/kinds/RootView.coffee index f7bde789b..a5dac5e7e 100644 --- a/app/views/kinds/RootView.coffee +++ b/app/views/kinds/RootView.coffee @@ -6,8 +6,9 @@ CocoView = require './CocoView' {logoutUser, me} = require('lib/auth') locale = require 'locale/locale' -Achievement = require '../../models/Achievement' -User = require '../../models/User' +AchievementPopup = require 'views/achievements/AchievementPopup' +utils = require 'lib/utils' + # TODO remove filterKeyboardEvents = (allowedEvents, func) -> @@ -32,61 +33,13 @@ module.exports = class RootView extends CocoView 'achievements:new': 'handleNewAchievements' showNewAchievement: (achievement, earnedAchievement) -> - currentLevel = me.level() - nextLevel = currentLevel + 1 - currentLevelExp = User.expForLevel(currentLevel) - nextLevelExp = User.expForLevel(nextLevel) - totalExpNeeded = nextLevelExp - currentLevelExp - expFunction = achievement.getExpFunction() - currentExp = me.get('points') - previousExp = currentExp - achievement.get('worth') - previousExp = expFunction(earnedAchievement.get('previouslyAchievedAmount')) * achievement.get('worth') if achievement.isRepeatable() - achievedExp = currentExp - previousExp - leveledUp = currentExp - achievedExp < currentLevelExp - alreadyAchievedPercentage = 100 * (previousExp - currentLevelExp) / totalExpNeeded - newlyAchievedPercentage = if leveledUp then 100 * (currentExp - currentLevelExp) / totalExpNeeded else 100 * achievedExp / totalExpNeeded - - console.debug "Current level is #{currentLevel} (#{currentLevelExp} xp), next level is #{nextLevel} (#{nextLevelExp} xp)." - console.debug "Need a total of #{nextLevelExp - currentLevelExp}, already had #{previousExp} and just now earned #{achievedExp} totalling on #{currentExp}" - - alreadyAchievedBar = $("
") - newlyAchievedBar = $("
") - emptyBar = $("
") - progressBar = $('
').append(alreadyAchievedBar).append(newlyAchievedBar).append(emptyBar) - message = if (currentLevel isnt 1) and leveledUp then "Reached level #{currentLevel}!" else null - - alreadyAchievedBar.tooltip(title: "#{currentExp} XP in total") - newlyAchievedBar.tooltip(title: "#{achievedExp} XP earned") - emptyBar.tooltip(title: "#{nextLevelExp - currentExp} XP until level #{nextLevel}") - - # TODO a default should be linked here - imageURL = '/file/' + achievement.get('icon') - data = - title: achievement.get('name') - image: $("") - description: achievement.get('description') - progressBar: progressBar - earnedExp: "+ #{achievedExp} XP" - message: message - - options = - autoHideDelay: 10000 - globalPosition: 'bottom right' - showDuration: 400 - style: 'achievement' - autoHide: true - clickToHide: true - - $.notify( data, options ) + popup = new AchievementPopup achievement: achievement, earnedAchievement: earnedAchievement handleNewAchievements: (earnedAchievements) -> - _.each(earnedAchievements.models, (earnedAchievement) => + _.each earnedAchievements.models, (earnedAchievement) => achievement = new Achievement(_id: earnedAchievement.get('achievement')) - console.log achievement - achievement.fetch( + achievement.fetch success: (achievement) => @showNewAchievement(achievement, earnedAchievement) - ) - ) logoutAccount: -> logoutUser($('#login-email').val()) diff --git a/app/views/kinds/SearchView.coffee b/app/views/kinds/SearchView.coffee index 7fdd4cad6..1e41c8ead 100644 --- a/app/views/kinds/SearchView.coffee +++ b/app/views/kinds/SearchView.coffee @@ -1,6 +1,6 @@ RootView = require 'views/kinds/RootView' +NewModelModal = require 'views/modal/NewModelModal' template = require 'templates/kinds/search' -forms = require 'lib/forms' app = require 'application' class SearchCollection extends Backbone.Collection @@ -26,9 +26,7 @@ module.exports = class SearchView extends RootView events: 'change input#search': 'runSearch' 'keydown input#search': 'runSearch' - 'click button.new-model-submit': 'makeNewModel' - 'submit form': 'makeNewModel' - 'shown.bs.modal #new-model-modal': 'focusOnName' + 'click #new-model-button': 'newModel' 'hidden.bs.modal #new-model-modal': 'onModalHidden' constructor: (options) -> @@ -79,31 +77,11 @@ module.exports = class SearchView extends RootView @collection.off() @collection = null - makeNewModel: (e) -> - e.preventDefault() - name = @$el.find('#name').val() - model = new @model() - model.set('name', name) - if @model.schema.properties.permissions - model.set 'permissions', [{access: 'owner', target: me.id}] - res = model.save() - return unless res - - modal = @$el.find('#new-model-modal') - forms.clearFormAlerts(modal) - @showLoading(modal.find('.modal-body')) - res.error => - @hideLoading() - forms.applyErrorsToForm(modal, JSON.parse(res.responseText)) - that = @ - res.success -> - that.model = model - modal.modal('hide') - - onModalHidden: -> - # Can only redirect after the modal hidden event has triggered + onNewModelSaved: (@model) -> base = document.location.pathname[1..] + '/' app.router.navigate(base + (@model.get('slug') or @model.id), {trigger: true}) - focusOnName: -> - @$el.find('#name').focus() + newModel: (e) -> + modal = new NewModelModal model: @model, modelLabel: @modelLabel + modal.once 'success', @onNewModelSaved + @openModalView modal diff --git a/app/views/kinds/UserView.coffee b/app/views/kinds/UserView.coffee new file mode 100644 index 000000000..d73e9cc7f --- /dev/null +++ b/app/views/kinds/UserView.coffee @@ -0,0 +1,39 @@ +RootView = require 'views/kinds/RootView' +template = require 'templates/kinds/user' +User = require 'models/User' + +module.exports = class UserView extends RootView + template: template + className: 'user-view' + viewName: null # Used for the breadcrumbs + + constructor: (@userID, options) -> + super options + @listenTo @, 'userNotFound', @ifUserNotFound + @fetchUser @userID + + fetchUser: -> + if @isMe() + @user = me + @onLoaded() + @user = new User _id: @userID + @supermodel.loadModel @user, 'user' + + getRenderData: -> + context = super() + context.viewName = @viewName + context.user = @user unless @user?.isAnonymous() + context + + isMe: -> @userID is me.id + + onLoaded: -> + @onUserLoaded @user if @user.loaded and not @userLoaded + super() + + onUserLoaded: -> + @userLoaded = true + + ifUserNotFound: -> + console.warn 'user not found' + @render() diff --git a/app/views/modal/ConfirmModal.coffee b/app/views/modal/ConfirmModal.coffee index 4749fc913..2ea188cf3 100644 --- a/app/views/modal/ConfirmModal.coffee +++ b/app/views/modal/ConfirmModal.coffee @@ -8,8 +8,8 @@ module.exports = class ConfirmModal extends ModalView closeOnConfirm: true events: - 'click #decline-button': 'doDecline' - 'click #confirm-button': 'doConfirm' + 'click #decline-button': 'onDecline' + 'click #confirm-button': 'onConfirm' constructor: (@renderData={}, options={}) -> super(options) @@ -21,10 +21,6 @@ module.exports = class ConfirmModal extends ModalView setRenderData: (@renderData) -> - onDecline: (@decline) -> + onDecline: -> @trigger 'decline' - onConfirm: (@confirm) -> - - doConfirm: -> @confirm() if @confirm - - doDecline: -> @decline() if @decline + onConfirm: -> @trigger 'confirm' diff --git a/app/views/modal/NewModelModal.coffee b/app/views/modal/NewModelModal.coffee new file mode 100644 index 000000000..0f7a33a10 --- /dev/null +++ b/app/views/modal/NewModelModal.coffee @@ -0,0 +1,54 @@ +ModalView = require 'views/kinds/ModalView' +template = require 'templates/modal/new_model' +forms = require 'lib/forms' + +module.exports = class NewModelModal extends ModalView + id: 'new-model-modal' + template: template + plain: false + + events: + 'click button.new-model-submit': 'onModelSubmitted' + 'submit form': 'onModelSubmitted' + + constructor: (options) -> + super options + @model = options.model + @modelLabel = options.modelLabel + @properties = options.properties + $('#name').ready @focusOnName + + getRenderData: -> + c = super() + c.modelLabel = @modelLabel + #c.newModelTitle = @newModelTitle + c + + makeNewModel: -> + model = new @model + name = @$el.find('#name').val() + model.set('name', name) + if @model.schema.properties.permissions + model.set 'permissions', [{access: 'owner', target: me.id}] + model.set(key, prop) for key, prop of @properties if @properties? + model + + onModelSubmitted: (e) -> + e.preventDefault() + model = @makeNewModel() + res = model.save() + return unless res + + forms.clearFormAlerts @$el + @showLoading(@$el.find('.modal-body')) + res.error => + @hideLoading() + forms.applyErrorsToForm(@$el, JSON.parse(res.responseText)) + #Backbone.Mediator.publish 'model-save-fail', model + res.success => + @$el.modal('hide') + @trigger 'model-created', model + #Backbone.Mediator.publish 'model-save-success', model + + focusOnName: (e) -> + $('#name').focus() # TODO Why isn't this working anymore.. It does get called diff --git a/app/views/play/MainPlayView.coffee b/app/views/play/MainPlayView.coffee index fa5aba4b6..c46f906c4 100644 --- a/app/views/play/MainPlayView.coffee +++ b/app/views/play/MainPlayView.coffee @@ -192,36 +192,8 @@ module.exports = class MainPlayView extends RootView levelPath: 'ladder' } ] - - playerCreated = [ - { - name: 'Extra Extrapolation' - difficulty: 2 - id: 'extra-extrapolation' - image: '/file/db/level/526bda3fe79aefde2a003e36/mobile_artillery_icon.png' - description: 'Predict your target\'s position for deadly aim. - by Sootn' - } - { - name: 'The Right Route' - difficulty: 1 - id: 'the-right-route' - image: '/file/db/level/526fd3043c637ece50001bb2/the_herd_icon.png' - description: 'Strike at the weak point in an array of enemies. - by Aftermath' - } - { - name: 'Sword Loop' - difficulty: 2 - id: 'sword-loop' - image: '/file/db/level/525dc5589a0765e496000006/drink_me_icon.png' - description: 'Kill the ogres and save the peasants with for-loops. - by Prabh Simran Singh Baweja' - } - { - name: 'Coin Mania' - difficulty: 2 - id: 'coin-mania' - image: '/file/db/level/529662dfe0df8f0000000007/grab_the_mushroom_icon.png' - description: 'Learn while-loops to grab coins and potions. - by Prabh Simran Singh Baweja' - } + + classicAlgorithms = [ { name: 'Bubble Sort Bootcamp Battle' difficulty: 3 @@ -257,6 +229,37 @@ module.exports = class MainPlayView extends RootView image: '/file/db/level/525ef8ef06e1ab0962000003/commanding_followers_icon.png' description: 'Learn Quicksort while sorting a spiral of ogres! - by Alexandru Caciulescu' } + ] + + playerCreated = [ + { + name: 'Extra Extrapolation' + difficulty: 2 + id: 'extra-extrapolation' + image: '/file/db/level/526bda3fe79aefde2a003e36/mobile_artillery_icon.png' + description: 'Predict your target\'s position for deadly aim. - by Sootn' + } + { + name: 'The Right Route' + difficulty: 1 + id: 'the-right-route' + image: '/file/db/level/526fd3043c637ece50001bb2/the_herd_icon.png' + description: 'Strike at the weak point in an array of enemies. - by Aftermath' + } + { + name: 'Sword Loop' + difficulty: 2 + id: 'sword-loop' + image: '/file/db/level/525dc5589a0765e496000006/drink_me_icon.png' + description: 'Kill the ogres and save the peasants with for-loops. - by Prabh Simran Singh Baweja' + } + { + name: 'Coin Mania' + difficulty: 2 + id: 'coin-mania' + image: '/file/db/level/529662dfe0df8f0000000007/grab_the_mushroom_icon.png' + description: 'Learn while-loops to grab coins and potions. - by Prabh Simran Singh Baweja' + } { name: 'Find the Spy' difficulty: 2 @@ -291,6 +294,7 @@ module.exports = class MainPlayView extends RootView {id: 'beginner', name: 'Beginner Campaign', description: '... in which you learn the wizardry of programming.', levels: tutorials} {id: 'multiplayer', name: 'Multiplayer Arenas', description: '... in which you code head-to-head against other players.', levels: arenas} {id: 'dev', name: 'Random Harder Levels', description: '... in which you learn the interface while doing something a little harder.', levels: experienced} + {id: 'classic' ,name: 'Classic Algorithms', description: '... in which you learn the most popular algorithms in Computer Science.', levels: classicAlgorithms} {id: 'player_created', name: 'Player-Created', description: '... in which you battle against the creativity of your fellow Artisan Wizards.', levels: playerCreated} ] context.levelStatusMap = @levelStatusMap diff --git a/app/views/play/level/LevelHUDView.coffee b/app/views/play/level/LevelHUDView.coffee index 975888025..6daa1d8d9 100644 --- a/app/views/play/level/LevelHUDView.coffee +++ b/app/views/play/level/LevelHUDView.coffee @@ -261,7 +261,7 @@ module.exports = class LevelHUDView extends CocoView return null # included in the bar context = prop: prop - hasIcon: prop in ['health', 'pos', 'target', 'inventory', 'gold', 'bountyGold', 'visualRange', 'attackDamage', 'attackRange', 'maxSpeed'] + hasIcon: prop in ['health', 'pos', 'target', 'collectedThangIDs', 'gold', 'bountyGold', 'visualRange', 'attackDamage', 'attackRange', 'maxSpeed'] hasBar: prop in ['health'] $(prop_template(context)) diff --git a/app/views/play/level/PlayLevelView.coffee b/app/views/play/level/PlayLevelView.coffee index 663dbd70f..391c99f4c 100644 --- a/app/views/play/level/PlayLevelView.coffee +++ b/app/views/play/level/PlayLevelView.coffee @@ -55,6 +55,7 @@ module.exports = class PlayLevelView extends RootView 'god:new-world-created': 'onNewWorld' 'god:infinite-loop': 'onInfiniteLoop' 'level-reload-from-data': 'onLevelReloadFromData' + 'level-reload-thang-type': 'onLevelReloadThangType' 'play-next-level': 'onPlayNextLevel' 'edit-wizard-settings': 'showWizardSettingsModal' 'surface:world-set-up': 'onSurfaceSetUpNewWorld' @@ -326,6 +327,15 @@ module.exports = class PlayLevelView extends RootView @scriptManager.setScripts(e.level.get('scripts')) Backbone.Mediator.publish 'tome:cast-spell' # a bit hacky + onLevelReloadThangType: (e) -> + tt = e.thangType + for url, model of @supermodel.models + if model.id is tt.id + for key, val of tt.attributes + model.attributes[key] = val + break + Backbone.Mediator.publish 'tome:cast-spell' + onWindowResize: (s...) -> $('#pointer').css('opacity', 0.0) diff --git a/app/views/user/AchievementsView.coffee b/app/views/user/AchievementsView.coffee new file mode 100644 index 000000000..c5a7f32bb --- /dev/null +++ b/app/views/user/AchievementsView.coffee @@ -0,0 +1,56 @@ +UserView = require 'views/kinds/UserView' +template = require 'templates/user/achievements' +{me} = require 'lib/auth' +Achievement = require 'models/Achievement' +EarnedAchievement = require 'models/EarnedAchievement' +AchievementCollection = require 'collections/AchievementCollection' +EarnedAchievementCollection = require 'collections/EarnedAchievementCollection' + +module.exports = class AchievementsView extends UserView + id: 'user-achievements-view' + template: template + viewName: 'Stats' + activeLayout: 'grid' + + events: + 'click #grid-layout-button': 'layoutChanged' + 'click #table-layout-button': 'layoutChanged' + + constructor: (userID, options) -> + super options, userID + + onLoaded: -> + unless @achievements or @earnedAchievements + @supermodel.resetProgress() + @achievements = new AchievementCollection + @earnedAchievements = new EarnedAchievementCollection @user.getSlugOrID() + @supermodel.loadCollection @achievements, 'achievements' + @supermodel.loadCollection @earnedAchievements, 'earnedAchievements' + else + for earned in @earnedAchievements.models + return unless relatedAchievement = _.find @achievements.models, (achievement) -> + achievement.get('_id') is earned.get 'achievement' + relatedAchievement.set 'unlocked', true + earned.set 'achievement', relatedAchievement + deferredImages = (achievement.cacheLockedImage() for achievement in @achievements.models when not achievement.get 'unlocked') + whenever = $.when deferredImages... + whenever.done => @render() + super() + + layoutChanged: (e) -> + @activeLayout = $(e.currentTarget).data 'layout' + @render() + + getRenderData: -> + context = super() + context.activeLayout = @activeLayout + + # After user is loaded + if @user and not @user.isAnonymous() + context.earnedAchievements = @earnedAchievements + context.achievements = @achievements + context.achievementsByCategory = {} + for achievement in @achievements.models + context.achievementsByCategory[achievement.get('category')] ?= [] + context.achievementsByCategory[achievement.get('category')].push achievement + context diff --git a/app/views/account/JobProfileCodeModal.coffee b/app/views/user/JobProfileCodeModal.coffee similarity index 100% rename from app/views/account/JobProfileCodeModal.coffee rename to app/views/user/JobProfileCodeModal.coffee diff --git a/app/views/account/JobProfileView.coffee b/app/views/user/JobProfileView.coffee similarity index 96% rename from app/views/account/JobProfileView.coffee rename to app/views/user/JobProfileView.coffee index 6b2ed8bfd..836b75676 100644 --- a/app/views/account/JobProfileView.coffee +++ b/app/views/user/JobProfileView.coffee @@ -1,4 +1,4 @@ -RootView = require 'views/kinds/RootView' +UserView = require 'views/kinds/UserView' template = require 'templates/account/profile' User = require 'models/User' LevelSession = require 'models/LevelSession' @@ -26,7 +26,7 @@ adminContacts = [ {id: '52a57252a89409700d0000d9', name: 'Ignore'} ] -module.exports = class JobProfileView extends RootView +module.exports = class JobProfileView extends UserView id: 'profile-view' template: template showBackground: false @@ -54,8 +54,7 @@ module.exports = class JobProfileView extends RootView 'change #admin-contact': 'onAdminContactChanged' 'click .session-link': 'onSessionLinkPressed' - constructor: (options, @userID) -> - @userID ?= me.id + constructor: (options, userID) -> @onJobProfileNotesChanged = _.debounce @onJobProfileNotesChanged, 1000 @onRemarkChanged = _.debounce @onRemarkChanged, 1000 @authorizedWithLinkedIn = IN?.User?.isAuthorized() @@ -64,32 +63,19 @@ module.exports = class JobProfileView extends RootView window.contractCallback = => @authorizedWithLinkedIn = IN?.User?.isAuthorized() @render() - super options - if me.get('anonymous') is true - @render() - return - if User.isObjectID @userID - @finishInit() - else - $.ajax "/db/user/#{@userID}/nameToID", success: (@userID) => - @finishInit() unless @destroyed - @render() + super userID, options + + onLoaded: -> + @finishInit() unless @destroyed + super() finishInit: -> return unless @userID @uploadFilePath = "db/user/#{@userID}" @highlightedContainers = [] - if @userID is me.id - @user = me - else if me.isAdmin() or 'employer' in me.get('permissions') - @user = User.getByID(@userID) - @user.fetch() - @listenTo @user, 'sync', => - @render() + if me.isAdmin() or 'employer' in me.get('permissions') $.post "/db/user/#{me.id}/track/view_candidate" $.post "/db/user/#{@userID}/track/viewed_by_employer" unless me.isAdmin() - else - @user = User.getByID(@userID) @sessions = @supermodel.loadCollection(new LevelSessionsCollection(@userID), 'candidate_sessions').model if me.isAdmin() # Mimicking how the VictoryModal fetches LevelFeedback @@ -248,7 +234,7 @@ module.exports = class JobProfileView extends RootView jobProfile.name ?= (@user.get('firstName') + ' ' + @user.get('lastName')).trim() if @user?.get('firstName') context.profile = jobProfile context.user = @user - context.myProfile = @user?.id is context.me.id + context.myProfile = @isMe() context.allowedToViewJobProfile = @user and (me.isAdmin() or 'employer' in me.get('permissions') or (context.myProfile && !me.get('anonymous'))) context.allowedToEditJobProfile = @user and (me.isAdmin() or (context.myProfile && !me.get('anonymous'))) context.profileApproved = @user?.get 'jobProfileApproved' @@ -289,7 +275,7 @@ module.exports = class JobProfileView extends RootView _.delay -> justSavedSection.removeClass 'just-saved', duration: 1500, easing: 'easeOutQuad' , 500 - if me.isAdmin() + if me.isAdmin() and @user and @remark visibleSettings = ['history', 'tasks'] data = _.pick (@remark.attributes), (value, key) -> key in visibleSettings data.history ?= [] @@ -544,7 +530,7 @@ module.exports = class JobProfileView extends RootView console.log 'Saved UserRemark', @remark, 'with response', response updateProgress: (highlightNext) -> - return unless @user + return unless @user?.loaded and @sessions?.loaded completed = 0 totalWeight = 0 next = null @@ -596,4 +582,4 @@ module.exports = class JobProfileView extends RootView sessionID = $(e.target).closest('.session-link').data('session-id') session = _.find @sessions.models, (session) -> session.id is sessionID modal = new JobProfileCodeModal({session:session}) - @openModalView modal \ No newline at end of file + @openModalView modal diff --git a/app/views/user/MainUserView.coffee b/app/views/user/MainUserView.coffee new file mode 100644 index 000000000..a200ab989 --- /dev/null +++ b/app/views/user/MainUserView.coffee @@ -0,0 +1,54 @@ +UserView = require 'views/kinds/UserView' +CocoCollection = require 'collections/CocoCollection' +LevelSession = require 'models/LevelSession' +template = require 'templates/user/user_home' +{me} = require 'lib/auth' +EarnedAchievementCollection = require 'collections/EarnedAchievementCollection' + +class LevelSessionsCollection extends CocoCollection + model: LevelSession + + constructor: (userID) -> + @url = "/db/user/#{userID}/level.sessions?project=state.complete,levelID,levelName,changed,team,submittedCodeLanguage,totalScore&order=-1" + super() + +module.exports = class MainUserView extends UserView + id: 'user-home' + template: template + + constructor: (userID, options) -> + super options + + getRenderData: -> + context = super() + if @levelSessions and @levelSessions.loaded + singlePlayerSessions = [] + multiPlayerSessions = [] + languageCounts = {} + for levelSession in @levelSessions.models + if levelSession.isMultiplayer() + multiPlayerSessions.push levelSession + else + singlePlayerSessions.push levelSession + languageCounts[levelSession.get 'submittedCodeLanguage'] = (languageCounts[levelSession.get 'submittedCodeLanguage'] or 0) + 1 + mostUsedCount = 0 + favoriteLanguage = null + for language, count of languageCounts + if count > mostUsedCount + mostUsedCount = count + favoriteLanguage = language + context.singlePlayerSessions = singlePlayerSessions + context.multiPlayerSessions = multiPlayerSessions + context.favoriteLanguage = favoriteLanguage + if @earnedAchievements and @earnedAchievements.loaded + context.earnedAchievements = @earnedAchievements + context + + onLoaded: -> + if @user.loaded and not (@earnedAchievements or @levelSessions) + @supermodel.resetProgress() + @levelSessions = new LevelSessionsCollection @user.getSlugOrID() + @earnedAchievements = new EarnedAchievementCollection @user.getSlugOrID() + @supermodel.loadCollection @levelSessions, 'levelSessions' + @supermodel.loadCollection @earnedAchievements, 'earnedAchievements' + super() diff --git a/bower.json b/bower.json index a909afb13..69204f667 100644 --- a/bower.json +++ b/bower.json @@ -32,7 +32,7 @@ "firepad": "~0.1.2", "marked": "~0.3.0", "moment": "~2.5.0", - "aether": "~0.2.22", + "aether": "~0.2.28", "underscore.string": "~2.3.3", "firebase": "~1.0.2", "catiline": "~2.9.3", @@ -40,7 +40,7 @@ "jsondiffpatch": "~0.1.5", "nanoscroller": "~0.8.0", "jquery.tablesorter": "~2.15.13", - "treema": "~0.0.12", + "treema": "~0.0.14", "bootstrap": "~3.1.1", "validated-backbone-mediator": "~0.1.3", "jquery.browser": "~0.0.6", diff --git a/package.json b/package.json index 27d76ce3b..7bf7b7893 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,7 @@ "winston": "0.6.x", "passport": "0.1.x", "passport-local": "0.1.x", + "moment": "~2.5.0", "mongodb": "1.2.x", "mongoose": "3.8.x", "mongoose-text-search": "~0.0.2", @@ -65,7 +66,7 @@ "redis": "", "webworker-threads": "~0.4.11", "node-gyp": "~0.13.0", - "aether": "~0.2.22", + "aether": "~0.2.28", "JASON": "~0.1.3", "JQDeferred": "~2.1.0" }, diff --git a/public/images/achievements/achievement_background.png b/public/images/achievements/achievement_background.png new file mode 100644 index 000000000..c74ff1bf2 Binary files /dev/null and b/public/images/achievements/achievement_background.png differ diff --git a/public/images/achievements/achievement_background_light.png b/public/images/achievements/achievement_background_light.png new file mode 100644 index 000000000..53e09e62d Binary files /dev/null and b/public/images/achievements/achievement_background_light.png differ diff --git a/public/images/achievements/achievement_background_locked.png b/public/images/achievements/achievement_background_locked.png new file mode 100644 index 000000000..94a300b12 Binary files /dev/null and b/public/images/achievements/achievement_background_locked.png differ diff --git a/public/images/achievements/bar_border.png b/public/images/achievements/bar_border.png new file mode 100644 index 000000000..9ad03ef20 Binary files /dev/null and b/public/images/achievements/bar_border.png differ diff --git a/public/images/achievements/border_diamond.png b/public/images/achievements/border_diamond.png new file mode 100644 index 000000000..a2e10f8f0 Binary files /dev/null and b/public/images/achievements/border_diamond.png differ diff --git a/public/images/achievements/border_diamond_locked.png b/public/images/achievements/border_diamond_locked.png new file mode 100644 index 000000000..bc56fbc75 Binary files /dev/null and b/public/images/achievements/border_diamond_locked.png differ diff --git a/public/images/achievements/border_gold.png b/public/images/achievements/border_gold.png new file mode 100644 index 000000000..7a46157c1 Binary files /dev/null and b/public/images/achievements/border_gold.png differ diff --git a/public/images/achievements/border_gold_locked.png b/public/images/achievements/border_gold_locked.png new file mode 100644 index 000000000..f1ee95e3d Binary files /dev/null and b/public/images/achievements/border_gold_locked.png differ diff --git a/public/images/achievements/border_silver.png b/public/images/achievements/border_silver.png new file mode 100644 index 000000000..016d48b00 Binary files /dev/null and b/public/images/achievements/border_silver.png differ diff --git a/public/images/achievements/border_silver_locked.png b/public/images/achievements/border_silver_locked.png new file mode 100644 index 000000000..44bcc7e84 Binary files /dev/null and b/public/images/achievements/border_silver_locked.png differ diff --git a/public/images/achievements/border_stone.png b/public/images/achievements/border_stone.png new file mode 100644 index 000000000..7d13718ce Binary files /dev/null and b/public/images/achievements/border_stone.png differ diff --git a/public/images/achievements/border_stone_locked.png b/public/images/achievements/border_stone_locked.png new file mode 100644 index 000000000..66f92b2b4 Binary files /dev/null and b/public/images/achievements/border_stone_locked.png differ diff --git a/public/images/achievements/border_wood.png b/public/images/achievements/border_wood.png new file mode 100644 index 000000000..368878c20 Binary files /dev/null and b/public/images/achievements/border_wood.png differ diff --git a/public/images/achievements/border_wood_locked.png b/public/images/achievements/border_wood_locked.png new file mode 100644 index 000000000..167e87421 Binary files /dev/null and b/public/images/achievements/border_wood_locked.png differ diff --git a/public/images/achievements/cross-01.png b/public/images/achievements/cross-01.png new file mode 100644 index 000000000..6a2ab02ef Binary files /dev/null and b/public/images/achievements/cross-01.png differ diff --git a/public/images/achievements/cup-01.png b/public/images/achievements/cup-01.png new file mode 100644 index 000000000..3b4c4c40b Binary files /dev/null and b/public/images/achievements/cup-01.png differ diff --git a/public/images/achievements/cup-02.png b/public/images/achievements/cup-02.png new file mode 100644 index 000000000..0eba69463 Binary files /dev/null and b/public/images/achievements/cup-02.png differ diff --git a/public/images/achievements/default.png b/public/images/achievements/default.png new file mode 100644 index 000000000..adc2d5be4 Binary files /dev/null and b/public/images/achievements/default.png differ diff --git a/public/images/achievements/level-bg.png b/public/images/achievements/level-bg.png new file mode 100644 index 000000000..9a23c0a6b Binary files /dev/null and b/public/images/achievements/level-bg.png differ diff --git a/public/images/achievements/message-01.png b/public/images/achievements/message-01.png new file mode 100644 index 000000000..8fe3dac44 Binary files /dev/null and b/public/images/achievements/message-01.png differ diff --git a/public/images/achievements/patch-01.png b/public/images/achievements/patch-01.png new file mode 100644 index 000000000..dba898f40 Binary files /dev/null and b/public/images/achievements/patch-01.png differ diff --git a/public/images/achievements/pendant-01.png b/public/images/achievements/pendant-01.png new file mode 100644 index 000000000..0d0b8fc00 Binary files /dev/null and b/public/images/achievements/pendant-01.png differ diff --git a/public/images/achievements/scroll-01.png b/public/images/achievements/scroll-01.png new file mode 100644 index 000000000..a7ab56721 Binary files /dev/null and b/public/images/achievements/scroll-01.png differ diff --git a/public/images/achievements/star.png b/public/images/achievements/star.png new file mode 100644 index 000000000..22f86961d Binary files /dev/null and b/public/images/achievements/star.png differ diff --git a/public/images/achievements/swords-01.png b/public/images/achievements/swords-01.png new file mode 100644 index 000000000..3d7b5170d Binary files /dev/null and b/public/images/achievements/swords-01.png differ diff --git a/public/images/pages/user/adventurer.png b/public/images/pages/user/adventurer.png new file mode 100644 index 000000000..2729d87b8 Binary files /dev/null and b/public/images/pages/user/adventurer.png differ diff --git a/public/images/pages/user/ambassador.png b/public/images/pages/user/ambassador.png new file mode 100644 index 000000000..f30002b33 Binary files /dev/null and b/public/images/pages/user/ambassador.png differ diff --git a/public/images/pages/user/archmage.png b/public/images/pages/user/archmage.png new file mode 100644 index 000000000..dad621ee0 Binary files /dev/null and b/public/images/pages/user/archmage.png differ diff --git a/public/images/pages/user/artisan.png b/public/images/pages/user/artisan.png new file mode 100644 index 000000000..351b1eace Binary files /dev/null and b/public/images/pages/user/artisan.png differ diff --git a/public/images/pages/user/diplomat.png b/public/images/pages/user/diplomat.png new file mode 100644 index 000000000..76c1cb6a7 Binary files /dev/null and b/public/images/pages/user/diplomat.png differ diff --git a/public/images/pages/user/general.png b/public/images/pages/user/general.png new file mode 100644 index 000000000..f57cf15d6 Binary files /dev/null and b/public/images/pages/user/general.png differ diff --git a/public/images/pages/user/scribe.png b/public/images/pages/user/scribe.png new file mode 100644 index 000000000..8c19f22ba Binary files /dev/null and b/public/images/pages/user/scribe.png differ diff --git a/scripts/recalculateAchievements.coffee b/scripts/recalculateAchievements.coffee new file mode 100644 index 000000000..2ec5e02c0 --- /dev/null +++ b/scripts/recalculateAchievements.coffee @@ -0,0 +1,19 @@ +database = require '../server/commons/database' +mongoose = require 'mongoose' +log = require 'winston' +async = require 'async' + +### SET UP ### +do (setupLodash = this) -> + GLOBAL._ = require 'lodash' + _.str = require 'underscore.string' + _.mixin _.str.exports() + +database.connect() + +EarnedAchievementHandler = require '../server/achievements/earned_achievement_handler' +log.info 'Starting earned achievement recalculation...' +EarnedAchievementHandler.constructor.recalculate (err) -> + log.error err if err? + log.info 'Finished recalculating all earned achievements.' + process.exit() diff --git a/scripts/recalculateStatistics.coffee b/scripts/recalculateStatistics.coffee new file mode 100644 index 000000000..7177acf9d --- /dev/null +++ b/scripts/recalculateStatistics.coffee @@ -0,0 +1,54 @@ +database = require '../server/commons/database' +mongoose = require 'mongoose' +log = require 'winston' +async = require 'async' + +### SET UP ### +do (setupLodash = this) -> + GLOBAL._ = require 'lodash' + _.str = require 'underscore.string' + _.mixin _.str.exports() + +database.connect() + +### USER STATS ### +UserHandler = require '../server/users/user_handler' + +report = (func, name, done) -> + log.info 'Started ' + name + '...' + func name, (err) -> + log.warn err if err? + log.info 'Finished ' + name + done err if done? + +whenAllFinished = -> + log.info 'All recalculations finished.' + process.exit() + +async.parallel [ + # Misc + (c) -> report UserHandler.recalculateStats, 'gamesCompleted', c + # Edits + (c) -> report UserHandler.recalculateStats, 'articleEdits', c + (c) -> report UserHandler.recalculateStats, 'levelEdits', c + (c) -> report UserHandler.recalculateStats, 'levelComponentEdits', c + (c) -> report UserHandler.recalculateStats, 'levelSystemEdits', c + (c) -> report UserHandler.recalculateStats, 'thangTypeEdits', c + # Patches + (c) -> report UserHandler.recalculateStats, 'patchesContributed', c + (c) -> report UserHandler.recalculateStats, 'patchesSubmitted', c + (c) -> report UserHandler.recalculateStats, 'totalTranslationPatches', c + (c) -> report UserHandler.recalculateStats, 'totalMiscPatches', c + + (c) -> report UserHandler.recalculateStats, 'articleMiscPatches', c + (c) -> report UserHandler.recalculateStats, 'levelMiscPatches', c + (c) -> report UserHandler.recalculateStats, 'levelComponentMiscPatches', c + (c) -> report UserHandler.recalculateStats, 'levelSystemMiscPatches', c + (c) -> report UserHandler.recalculateStats, 'thangTypeMiscPatches', c + + (c) -> report UserHandler.recalculateStats, 'articleTranslationPatches', c + (c) -> report UserHandler.recalculateStats, 'levelTranslationPatches', c + (c) -> report UserHandler.recalculateStats, 'levelComponentTranslationPatches', c + (c) -> report UserHandler.recalculateStats, 'levelSystemTranslationPatches', c + (c) -> report UserHandler.recalculateStats, 'thangTypeTranslationPatches', c +], whenAllFinished diff --git a/scripts/setupAchievements.coffee b/scripts/setupAchievements.coffee new file mode 100644 index 000000000..42cfb4e9f --- /dev/null +++ b/scripts/setupAchievements.coffee @@ -0,0 +1,232 @@ +database = require '../server/commons/database' +mongoose = require 'mongoose' +log = require 'winston' +async = require 'async' + +### SET UP ### +do (setupLodash = this) -> + GLOBAL._ = require 'lodash' + _.str = require 'underscore.string' + _.mixin _.str.exports() + +database.connect() + + +## Util + +## Types +contributor = (obj) -> + _.extend obj, # This way we get the name etc on top + collection: 'users' + userField: '_id' + category: 'contributor' + +### UNLOCKABLES ### +# Generally ordered according to user.stats schema +unlockableAchievements = + signup: + name: 'Signed Up' + description: 'Signed up to the most awesome coding game around.' + query: 'anonymous': false + worth: 10 + collection: 'users' + userField: '_id' + category: 'miscellaneous' + difficulty: 1 + recalculable: true + + completedFirstLevel: + name: 'Completed 1 Level' + description: 'Completed your very first level.' + query: 'stats.gamesCompleted': $gte: 1 + worth: 20 + collection: 'users' + userField: '_id' + category: 'levels' + difficulty: 1 + recalculable: true + + completedFiveLevels: + name: 'Completed 5 Levels' + description: 'Completed 5 Levels.' + query: 'stats.gamesCompleted': $gte: 5 + worth: 50 + collection: 'users' + userField: '_id' + category: 'levels' + difficulty: 2 + recalculable: true + + completedTwentyLevels: + name: 'Completed 20 Levels' + description: 'Completed 20 Levels.' + query: 'stats.gamesCompleted': $gte: 20 + worth: 500 + collection: 'users' + userField: '_id' + category: 'levels' + difficulty: 3 + recalculable: true + + editedOneArticle: contributor + name: 'Edited an Article' + description: 'Edited your first Article.' + query: 'stats.articleEdits': $gte: 1 + worth: 50 + difficulty: 1 + + editedOneLevel: contributor + name: 'Edited a Level' + description: 'Edited your first Level.' + query: 'stats.levelEdits': $gte: 1 + worth: 50 + difficulty: 1 + recalculable: true + + editedOneLevelSystem: contributor + name: 'Edited a Level System' + description: 'Edited your first Level System.' + query: 'stats.levelSystemEdits': $gte: 1 + worth: 50 + difficulty: 1 + recalculable: true + + editedOneLevelComponent: contributor + name: 'Edited a Level Component' + description: 'Edited your first Level Component.' + query: 'stats.levelComponentEdits': $gte: 1 + worth: 50 + difficulty: 1 + recalculable: true + + editedOneThangType: contributor + name: 'Edited a Thang Type' + description: 'Edited your first Thang Type.' + query: 'stats.thangTypeEdits': $gte: 1 + worth: 50 + difficulty: 1 + recalculable: true + + submittedOnePatch: contributor + name: 'Submitted a Patch' + description: 'Submitted your very first patch.' + query: 'stats.patchesSubmitted': $gte: 1 + worth: 50 + difficulty: 1 + recalculable: true + + contributedOnePatch: contributor + name: 'Contributed a Patch' + description: 'Got your very first accepted Patch.' + query: 'stats.patchesContributed': $gte: 1 + worth: 50 + difficulty: 1 + recalculable: true + + acceptedOnePatch: contributor + name: 'Accepted a Patch' + description: 'Accepted your very first patch.' + query: 'stats.patchesAccepted': $gte: 1 + worth: 50 + difficulty: 1 + recalculable: false + + oneTranslationPatch: contributor + name: 'First Translation' + description: 'Did your very first translation.' + query: 'stats.totalTranslationPatches': $gte: 1 + worth: 50 + difficulty: 1 + recalculable: true + + oneMiscPatch: contributor + name: 'First Miscellaneous Patch' + description: 'Did your first miscellaneous patch.' + query: 'stats.totalMiscPatches': $gte: 1 + worth: 50 + difficulty: 1 + recalculable: true + + oneArticleTranslationPatch: contributor + name: 'First Article Translation' + description: 'Did your very first Article translation.' + query: 'stats.articleTranslationPatches': $gte: 1 + worth: 50 + difficulty: 1 + recalculable: true + + oneArticleMiscPatch: contributor + name: 'First Misc Article Patch' + description: 'Did your first miscellaneous Article patch.' + query: 'stats.totalMiscPatches': $gte: 1 + worth: 50 + difficulty: 1 + recalculable: true + + oneLevelTranslationPatch: contributor + name: 'First Level Translation' + description: 'Did your very first Level translation.' + query: 'stats.levelTranslationPatches': $gte: 1 + worth: 50 + difficulty: 1 + recalculable: true + + oneLevelMiscPatch: contributor + name: 'First Misc Level Patch' + description: 'Did your first misc Level patch.' + query: 'stats.levelMiscPatches': $gte: 1 + worth: 50 + difficulty: 1 + recalculable: true + + +### REPEATABLES ### +repeatableAchievements = + simulatedBy: + name: 'Simulated ladder game' + description: 'Simulated a ladder game.' + query: 'simulatedBy': $gte: 1 + worth: 1 + collection: 'users' + userField: '_id' + category: 'miscellaneous' + difficulty: 1 + proportionalTo: 'simulatedBy' + function: + kind: 'logarithmic' + parameters: # TODO tweak + a: 5 + b: 1 + c: 0 + +Achievement = require '../server/achievements/Achievement' +EarnedAchievement = require '../server/achievements/EarnedAchievement' + +Achievement.find {}, (err, achievements) -> + achievementIDs = (achievement.get('_id') + '' for achievement in achievements) + EarnedAchievement.remove {achievement: $in: achievementIDs}, (err, count) -> + return log.error err if err? + log.info "Removed #{count} earned achievements that were related" + + Achievement.remove {}, (err) -> + log.error err if err? + log.info 'Removed all achievements.' + + log.info "Got #{Object.keys(unlockableAchievements).length} unlockable achievements" + log.info "and #{Object.keys(repeatableAchievements).length} repeatable achievements" + achievements = _.extend unlockableAchievements, repeatableAchievements + + async.each Object.keys(achievements), (key, callback) -> + achievement = achievements[key] + log.info "Setting up '#{achievement.name}'..." + achievementM = new Achievement achievement + # What the actual * Mongoose? It automatically converts 'stats.edits' to a nested object + achievementM.set 'query', achievement.query + log.debug JSON.stringify achievementM.get 'query' + achievementM.save (err) -> + log.error err if err? + callback() + , (err) -> + log.error err if err? + log.info 'Finished setting up achievements.' + process.exit() diff --git a/server/achievements/Achievement.coffee b/server/achievements/Achievement.coffee index fed2cfa5b..4fae21adf 100644 --- a/server/achievements/Achievement.coffee +++ b/server/achievements/Achievement.coffee @@ -1,8 +1,9 @@ mongoose = require 'mongoose' jsonschema = require '../../app/schemas/models/achievement' log = require 'winston' -util = require '../../app/lib/utils' -plugins = require '../plugins/plugins' +utils = require '../../app/lib/utils' +plugins = require('../plugins/plugins') +AchievablePlugin = require '../plugins/achievements' # `pre` and `post` are not called for update operations executed directly on the database, # including `Model.update`,`.findByIdAndUpdate`,`.findOneAndUpdate`, `.findOneAndRemove`,and `.findByIdAndRemove`.order @@ -23,23 +24,48 @@ AchievementSchema.methods.objectifyQuery = -> AchievementSchema.methods.stringifyQuery = -> @set('query', JSON.stringify(@get('query'))) if typeof @get('query') != 'string' - getExpFunction: -> - kind = @get('function')?.kind or jsonschema.function.default.kind - parameters = @get('function')?.parameters or jsonschema.function.default.parameters - return utils.functionCreators[kind](parameters) if kind of utils.functionCreators +AchievementSchema.methods.getExpFunction = -> + kind = @get('function')?.kind or jsonschema.properties.function.default.kind + parameters = @get('function')?.parameters or jsonschema.properties.function.default.parameters + return utils.functionCreators[kind](parameters) if kind of utils.functionCreators -AchievementSchema.post('init', (doc) -> doc.objectifyQuery()) +AchievementSchema.methods.isRecalculable = -> @get('recalculable') is true -AchievementSchema.pre('save', (next) -> +AchievementSchema.statics.jsonschema = jsonschema +AchievementSchema.statics.earnedAchievements = {} + +# Reloads all achievements into memory. +# TODO might want to tweak this to only load new achievements +AchievementSchema.statics.loadAchievements = (done) -> + AchievementSchema.statics.resetAchievements() + Achievement = require('../achievements/Achievement') + query = Achievement.find({}) + query.exec (err, docs) -> + _.each docs, (achievement) -> + category = achievement.get 'collection' + AchievementSchema.statics.earnedAchievements[category] = [] unless category of AchievementSchema.statics.earnedAchievements + AchievementSchema.statics.earnedAchievements[category].push achievement + done?(AchievementSchema.statics.earnedAchievements) + +AchievementSchema.statics.getLoadedAchievements = -> + AchievementSchema.statics.earnedAchievements + +AchievementSchema.statics.resetAchievements = -> + delete AchievementSchema.statics.earnedAchievements[category] for category of AchievementSchema.statics.earnedAchievements + +# Queries are stored as JSON strings, objectify them upon loading +AchievementSchema.post 'init', (doc) -> doc.objectifyQuery() + +AchievementSchema.pre 'save', (next) -> @stringifyQuery() next() -) + +# Reload achievements upon save +AchievementSchema.post 'save', -> @constructor.loadAchievements() AchievementSchema.plugin(plugins.NamedPlugin) AchievementSchema.plugin(plugins.SearchablePlugin, {searchable: ['name']}) -module.exports = Achievement = mongoose.model('Achievement', AchievementSchema) +module.exports = Achievement = mongoose.model('Achievement', AchievementSchema, 'achievements') -# Reload achievements upon save -AchievablePlugin = require '../plugins/achievements' -AchievementSchema.post 'save', (doc) -> AchievablePlugin.loadAchievements() +AchievementSchema.statics.loadAchievements() diff --git a/server/achievements/achievement_handler.coffee b/server/achievements/achievement_handler.coffee index 989a8b955..211068bd1 100644 --- a/server/achievements/achievement_handler.coffee +++ b/server/achievements/achievement_handler.coffee @@ -5,10 +5,32 @@ class AchievementHandler extends Handler modelClass: Achievement # Used to determine which properties requests may edit - editableProperties: ['name', 'query', 'worth', 'collection', 'description', 'userField', 'proportionalTo', 'icon', 'function'] + editableProperties: ['name', 'query', 'worth', 'collection', 'description', 'userField', 'proportionalTo', 'icon', 'function', 'related', 'difficulty', 'category', 'recalculable'] + allowedMethods: ['GET', 'POST', 'PUT', 'PATCH', 'DELETE'] jsonSchema = require '../../app/schemas/models/achievement.coffee' + hasAccess: (req) -> req.method is 'GET' or req.user?.isAdmin() + get: (req, res) -> + # /db/achievement?related= + if req.query.related + return @sendUnauthorizedError(res) if not @hasAccess(req) + Achievement.find {related: req.query.related}, (err, docs) => + return @sendDatabaseError(res, err) if err + docs = (@formatEntity(req, doc) for doc in docs) + @sendSuccess res, docs + else + super req, res + + delete: (req, res, slugOrID) -> + return @sendUnauthorizedError res unless req.user?.isAdmin() + @getDocumentForIdOrSlug slugOrID, (err, document) => # Check first + return @sendDatabaseError(res, err) if err + return @sendNotFoundError(res) unless document? + document.remove (err, document) => + return @sendDatabaseError(res, err) if err + @sendNoContent res + module.exports = new AchievementHandler() diff --git a/server/achievements/earned_achievement_handler.coffee b/server/achievements/earned_achievement_handler.coffee index 11f40cc54..0926bcd28 100644 --- a/server/achievements/earned_achievement_handler.coffee +++ b/server/achievements/earned_achievement_handler.coffee @@ -17,20 +17,19 @@ class EarnedAchievementHandler extends Handler recalculate: (req, res) -> onSuccess = (data) => log.debug 'Finished recalculating achievements' if 'achievements' of req.body # Support both slugs and IDs separated by commas - achievementSlugsOrIDs = req.body.achievements + achievementSlugsOrIDs = req.body.earnedAchievements EarnedAchievementHandler.recalculate achievementSlugsOrIDs, onSuccess else EarnedAchievementHandler.recalculate onSuccess - @sendSuccess res, {} + @sendAccepted res, {} - # Returns success: boolean - # TODO call onFinished - @recalculate: (callbackOrSlugsOrIDs, onFinished) -> - if _.isArray callbackOrSlugsOrIDs + @recalculate: (callbackOrSlugsOrIDs, callback) -> + if _.isArray callbackOrSlugsOrIDs # slugs or ids achievementSlugs = (thing for thing in callbackOrSlugsOrIDs when not Handler.isID(thing)) achievementIDs = (thing for thing in callbackOrSlugsOrIDs when Handler.isID(thing)) - else - onFinished = callbackOrSlugsOrIDs + else # just a callback + callback = callbackOrSlugsOrIDs + onFinished = -> callback arguments... filter = {} filter.$or = [ @@ -40,11 +39,16 @@ class EarnedAchievementHandler extends Handler # Fetch all relevant achievements Achievement.find filter, (err, achievements) -> - return log.error err if err? + callback?(err) if err? + callback?(new Error 'No achievements to recalculate') unless achievements.length + log.info "Recalculating a total of #{achievements.length} achievements..." # Fetch every single user User.find {}, (err, users) -> - _.each users, (user) -> + callback?(err) if err? + log.info "for a total of #{users.length} users." + + async.each users, ((user, doneWithUser) -> # Keep track of a user's already achieved in order to set the notified values correctly userID = user.get('_id').toHexString() @@ -52,63 +56,60 @@ class EarnedAchievementHandler extends Handler EarnedAchievement.find {user: userID}, (err, alreadyEarned) -> alreadyEarnedIDs = [] previousPoints = 0 - _.each alreadyEarned, (earned) -> - if (_.find achievements, (single) -> earned.get('achievement') is single.get('_id').toHexString()) + async.each alreadyEarned, ((earned, doneWithEarned) -> + if (_.find achievements, (single) -> earned.get('achievement') is single.get('_id').toHexString()) # if already earned alreadyEarnedIDs.push earned.get('achievement') previousPoints += earned.get 'earnedPoints' + doneWithEarned() + ), -> # After checking already achieved + # TODO maybe also delete earned? Make sure you don't delete too many - # TODO maybe also delete earned? Make sure you don't delete too many + newTotalPoints = 0 - newTotalPoints = 0 + async.each achievements, ((achievement, doneWithAchievement) -> + return doneWithAchievement() unless achievement.isRecalculable() - earnedAchievementSaverGenerator = (achievement) -> (callback) -> - isRepeatable = achievement.get('proportionalTo')? - model = mongoose.model(achievement.get('collection')) - if not model? - log.error "Model #{achievement.get 'collection'} doesn't even exist." - return callback() + isRepeatable = achievement.get('proportionalTo')? + model = mongoose.modelNameByCollection(achievement.get('collection')) + return doneWithAchievement new Error "Model with collection '#{achievement.get 'collection'}' doesn't exist." unless model? - model.findOne achievement.query, (err, something) -> - return callback() unless something + finalQuery = _.clone achievement.get 'query' + finalQuery.$or = [{}, {}] # Allow both ObjectIDs or hex string IDs + finalQuery.$or[0][achievement.userField] = userID + finalQuery.$or[1][achievement.userField] = mongoose.Types.ObjectId userID - log.debug "Matched an achievement: #{achievement.get 'name'}" + model.findOne finalQuery, (err, something) -> + return doneWithAchievement() if _.isEmpty something - earned = - user: userID - achievement: achievement._id.toHexString() - achievementName: achievement.get 'name' - notified: achievement._id in alreadyEarnedIDs + #log.debug "Matched an achievement: #{achievement.get 'name'} for #{user.get 'name'}" - if isRepeatable - earned.achievedAmount = something.get(achievement.get 'proportionalTo') - earned.previouslyAchievedAmount = 0 + earned = + user: userID + achievement: achievement._id.toHexString() + achievementName: achievement.get 'name' + notified: achievement._id in alreadyEarnedIDs - expFunction = achievement.getExpFunction() - newPoints = expFunction(earned.achievedAmount) * achievement.get('worth') - else - newPoints = achievement.get 'worth' + if isRepeatable + earned.achievedAmount = something.get(achievement.get 'proportionalTo') + earned.previouslyAchievedAmount = 0 - earned.earnedPoints = newPoints - newTotalPoints += newPoints + expFunction = achievement.getExpFunction() + newPoints = expFunction(earned.achievedAmount) * achievement.get('worth') + else + newPoints = achievement.get 'worth' - EarnedAchievement.update {achievement: earned.achievement, user: earned.user}, earned, {upsert: true}, (err) -> - log.error err if err? - callback() + earned.earnedPoints = newPoints + newTotalPoints += newPoints - saveUserPoints = (callback) -> - # In principle it is enough to deduct the old amount of points and add the new amount, - # but just to be entirely safe let's start from 0 in case we're updating all of a user's achievements - log.debug "Matched a total of #{newTotalPoints} new points" - if _.isEmpty filter # Completely clean - User.update {_id: userID}, {$set: points: newTotalPoints}, {}, (err) -> log.error err if err? - else + EarnedAchievement.update {achievement:earned.achievement, user:earned.user}, earned, {upsert: true}, (err) -> + doneWithAchievement err + ), -> # Wrap up a user, save points + # Since some achievements cannot be recalculated it's important to deduct the old amount of exp + # and add the new amount, instead of just setting to the new amount + return doneWithUser() unless newTotalPoints + log.debug "Matched a total of #{newTotalPoints} new points" log.debug "Incrementing score for these achievements with #{newTotalPoints - previousPoints}" - User.update {_id: userID}, {$inc: points: newTotalPoints - previousPoints}, {}, (err) -> log.error err if err? - - earnedAchievementSavers = (earnedAchievementSaverGenerator(achievement) for achievement in achievements) - earnedAchievementSavers.push saveUserPoints - - # We need to have all these database updates chained so we know the final score - async.series earnedAchievementSavers + User.update {_id: userID}, {$inc: points: newTotalPoints - previousPoints}, {}, doneWithUser + ), onFinished module.exports = new EarnedAchievementHandler() diff --git a/server/commons/Handler.coffee b/server/commons/Handler.coffee index 311666c19..09d58622c 100644 --- a/server/commons/Handler.coffee +++ b/server/commons/Handler.coffee @@ -55,8 +55,9 @@ module.exports = class Handler # sending functions sendUnauthorizedError: (res) -> errors.forbidden(res) #TODO: rename sendUnauthorizedError to sendForbiddenError + sendForbiddenError: (res) -> errors.forbidden(res) sendNotFoundError: (res, message) -> errors.notFound(res, message) - sendMethodNotAllowed: (res) -> errors.badMethod(res) + sendMethodNotAllowed: (res, message) -> errors.badMethod(res, @allowedMethods, message) sendBadInputError: (res, message) -> errors.badInput(res, message) sendDatabaseError: (res, err) -> return @sendError(res, err.code, err.response) if err.response and err.code @@ -70,6 +71,18 @@ module.exports = class Handler res.send(message) res.end() + sendCreated: (res, message) -> + res.send 201, message + res.end() + + sendAccepted: (res, message) -> + res.send 202, message + res.end() + + sendNoContent: (res) -> + res.send 204 + res.end() + # generic handlers get: (req, res) -> @sendUnauthorizedError(res) if not @hasAccess(req) @@ -442,9 +455,9 @@ module.exports = class Handler res.send dict res.end() - delete: (req, res) -> @sendMethodNotAllowed res, @allowedMethods, 'DELETE not allowed.' + delete: (req, res) -> @sendMethodNotAllowed res, 'DELETE not allowed.' - head: (req, res) -> @sendMethodNotAllowed res, @allowedMethods, 'HEAD not allowed.' + head: (req, res) -> @sendMethodNotAllowed res, 'HEAD not allowed.' # This is not a Mongoose user projectionForUser: (req, model, ownerID) -> diff --git a/server/commons/mapping.coffee b/server/commons/mapping.coffee index 69f8abfc0..25e72e93d 100644 --- a/server/commons/mapping.coffee +++ b/server/commons/mapping.coffee @@ -27,3 +27,12 @@ module.exports.routes = 'routes/queue' 'routes/stacklead' ] + +mongoose = require 'mongoose' +module.exports.modules = modules = # by collection name + 'achievements': 'Achievement' + 'level.sessions': 'level.session' + 'users': 'User' + +mongoose.modelNameByCollection = (collection) -> + mongoose.model modules[collection] if collection of modules diff --git a/server/levels/sessions/LevelSession.coffee b/server/levels/sessions/LevelSession.coffee index b8f0a58dc..81f23a7e7 100644 --- a/server/levels/sessions/LevelSession.coffee +++ b/server/levels/sessions/LevelSession.coffee @@ -4,6 +4,7 @@ mongoose = require 'mongoose' plugins = require '../../plugins/plugins' AchievablePlugin = require '../../plugins/achievements' jsonschema = require '../../../app/schemas/models/level_session' +log = require 'winston' LevelSessionSchema = new mongoose.Schema({ created: @@ -20,8 +21,25 @@ LevelSessionSchema.pre 'init', (next) -> @set(prop, _.cloneDeep(sch.default)) if sch.default? next() +previous = {} + +LevelSessionSchema.post 'init', (doc) -> + previous[doc.get 'id'] = + 'state.completed': doc.get 'state.completed' + LevelSessionSchema.pre 'save', (next) -> @set('changed', new Date()) + + id = @get('id') + initd = id of previous + + # newly completed level + if not (initd and previous[id]['state.completed']) and @get('state.completed') + User = require '../../users/User' # Avoid mutual inclusion cycles + User.update {_id: @get 'creator'}, {$inc: 'stats.gamesCompleted': 1}, {}, (err, count) -> + log.error err if err? + + delete previous[id] if initd next() LevelSessionSchema.statics.privateProperties = ['code', 'submittedCode', 'unsubscribed'] @@ -30,4 +48,6 @@ LevelSessionSchema.statics.editableProperties = ['multiplayer', 'players', 'code 'chat', 'teamSpells', 'submitted', 'submittedCodeLanguage', 'unsubscribed', 'playtime'] LevelSessionSchema.statics.jsonSchema = jsonschema -module.exports = LevelSession = mongoose.model('level.session', LevelSessionSchema) +LevelSessionSchema.index {user: 1, changed: -1}, {sparse: true, name: 'last played index'} + +module.exports = LevelSession = mongoose.model('level.session', LevelSessionSchema, 'level.sessions') diff --git a/server/levels/thangs/thang_type_handler.coffee b/server/levels/thangs/thang_type_handler.coffee index 9e51a80f3..fe775a358 100644 --- a/server/levels/thangs/thang_type_handler.coffee +++ b/server/levels/thangs/thang_type_handler.coffee @@ -26,4 +26,16 @@ ThangTypeHandler = class ThangTypeHandler extends Handler hasAccess: (req) -> req.method is 'GET' or req.user?.isAdmin() + get: (req, res) -> + if req.query.view is 'items' + projection = {} + if req.query.project + projection[field] = 1 for field in req.query.project.split(',') + ThangType.find({ 'kind': 'Item', slug: { $exists: true } }, projection).exec (err, documents) => + return @sendDatabaseError(res, err) if err + documents = (@formatEntity(req, doc) for doc in documents) + @sendSuccess(res, documents) + else + super(arguments...) + module.exports = new ThangTypeHandler() diff --git a/server/lib/utils.coffee b/server/lib/utils.coffee new file mode 100644 index 000000000..d0fd9d09e --- /dev/null +++ b/server/lib/utils.coffee @@ -0,0 +1,3 @@ + +module.exports = + isID: (id) -> _.isString(id) and id.length is 24 and id.match(/[a-f0-9]/gi)?.length is 24 diff --git a/server/patches/Patch.coffee b/server/patches/Patch.coffee index 05227e7f6..774e6ec37 100644 --- a/server/patches/Patch.coffee +++ b/server/patches/Patch.coffee @@ -1,7 +1,9 @@ -mongoose = require 'mongoose' +mongoose = require('mongoose') +deltas = require '../../app/lib/deltas' +log = require 'winston' {handlers} = require '../commons/mapping' -PatchSchema = new mongoose.Schema({}, {strict: false}) +PatchSchema = new mongoose.Schema({status: String}, {strict: false}) PatchSchema.pre 'save', (next) -> return next() unless @isNew # patch can't be altered after creation, so only need to check data once @@ -45,4 +47,32 @@ PatchSchema.pre 'save', (next) -> @targetLoaded = document document.save (err) -> next(err) +PatchSchema.methods.isTranslationPatch = -> # Don't ever fat arrow bind this one + expanded = deltas.flattenDelta @get('delta') + _.some expanded, (delta) -> 'i18n' in delta.dataPath + +PatchSchema.methods.isMiscPatch = -> + expanded = deltas.flattenDelta @get('delta') + _.some expanded, (delta) -> 'i18n' not in delta.dataPath + +# Keep track of when a patch is pending and newly approved. +PatchSchema.path('status').set (newVal) -> + @set 'wasPending', @status is 'pending' and newVal isnt 'pending' + @set 'newlyAccepted', newVal is 'accepted' and not @get('newlyAccepted') # Only true on the first accept + newVal + +PatchSchema.methods.isNewlyAccepted = -> @get('newlyAccepted') +PatchSchema.methods.wasPending = -> @get 'wasPending' + +PatchSchema.pre 'save', (next) -> + User = require '../users/User' + userID = @get('creator').toHexString() + + if @get('status') is 'accepted' + User.incrementStat userID, 'stats.patchesContributed' # accepted patches + else if @get('status') is 'pending' + User.incrementStat userID, 'stats.patchesSubmitted' # submitted patches + + next() + module.exports = mongoose.model('patch', PatchSchema) diff --git a/server/patches/patch_handler.coffee b/server/patches/patch_handler.coffee index bb376bbdf..0226e18c4 100644 --- a/server/patches/patch_handler.coffee +++ b/server/patches/patch_handler.coffee @@ -49,10 +49,27 @@ PatchHandler = class PatchHandler extends Handler if newStatus is 'withdrawn' return @sendUnauthorizedError(res) unless req.user.get('_id').equals patch.get('creator') + patch.set 'status', newStatus + + # Only increment statistics upon very first accept + if patch.isNewlyAccepted() + accepter = req.user.get 'id' + submitter = patch.get 'creator' + User.incrementStat accepter, 'stats.patchesAccepted' + # TODO maybe merge these increments together + if patch.isTranslationPatch() + User.incrementStat submitter, 'stats.totalTranslationPatches' + User.incrementStat submitter, User.statsMapping.translations[targetModel.modelName] + if patch.isMiscPatch() + User.incrementStat submitter, 'stats.totalMiscPatches' + User.incrementStat submitter, User.statsMapping.misc[targetModel.modelName] + + # these require callbacks - patch.update {$set: {status: newStatus}}, {}, -> - target.update {$pull: {patches: patch.get('_id')}}, {}, -> - @sendSuccess(res, null) + patch.save (err) => + log.error err if err? + target.update {$pull:{patches:patch.get('_id')}}, {}, -> + @sendSuccess(res, null) onPostSuccess: (req, doc) -> log.error 'Error sending patch created: could not find the loaded target on the patch object.' unless doc.targetLoaded diff --git a/server/plugins/achievements.coffee b/server/plugins/achievements.coffee index 431775268..23b1aba56 100644 --- a/server/plugins/achievements.coffee +++ b/server/plugins/achievements.coffee @@ -4,59 +4,64 @@ LocalMongo = require '../../app/lib/LocalMongo' util = require '../../app/lib/utils' log = require 'winston' -achievements = {} - -module.exports = AchievablePlugin = (schema, options) -> +# Warning: To ensure proper functioning one must always `find` documents before saving them. +# Otherwise the schema's `post init` won't be triggered and the plugin can't keep track of changes +# TODO if this is still a common scenario I could implement a database hit after all, but only +# on the condition that it's necessary and still not too frequent in occurrence +AchievablePlugin = (schema, options) -> User = require '../users/User' # Avoid mutual inclusion cycles Achievement = require '../achievements/Achievement' - checkForAchievement = (doc) -> - collectionName = doc.constructor.modelName - before = {} + # Keep track the document before it's saved schema.post 'init', (doc) -> before[doc.id] = doc.toObject() + # TODO check out how many objects go unreleased + # Check if an achievement has been earned schema.post 'save', (doc) -> - isNew = not doc.isInit('_id') + isNew = not doc.isInit('_id') or not (doc.id of before) originalDocObj = before[doc.id] unless isNew - category = doc.constructor.modelName + if doc.isInit('_id') and not doc.id of before + log.warn 'document was already initialized but did not go through `init` and is therefore treated as new while it might not be' - if category of achievements + category = doc.constructor.collection.name + loadedAchievements = Achievement.getLoadedAchievements() + #log.debug 'about to save ' + category + ', number of achievements is ' + Object.keys(loadedAchievements).length + + if category of loadedAchievements docObj = doc.toObject() - for achievement in achievements[category] + for achievement in loadedAchievements[category] query = achievement.get('query') isRepeatable = achievement.get('proportionalTo')? alreadyAchieved = if isNew then false else LocalMongo.matchesQuery originalDocObj, query newlyAchieved = LocalMongo.matchesQuery(docObj, query) - log.debug 'isRepeatable: ' + isRepeatable - log.debug 'alreadyAchieved: ' + alreadyAchieved - log.debug 'newlyAchieved: ' + newlyAchieved + #log.debug 'isRepeatable: ' + isRepeatable + #log.debug 'alreadyAchieved: ' + alreadyAchieved + #log.debug 'newlyAchieved: ' + newlyAchieved userObjectID = doc.get(achievement.get('userField')) userID = if _.isObject userObjectID then userObjectID.toHexString() else userObjectID # Standardize! Use strings, not ObjectId's if newlyAchieved and (not alreadyAchieved or isRepeatable) - earned = { + earned = user: userID achievement: achievement._id.toHexString() achievementName: achievement.get 'name' - } worth = achievement.get('worth') earnedPoints = 0 wrapUp = -> # Update user's experience points - User.update({_id: userID}, {$inc: {points: earnedPoints}}, {}, (err, count) -> - console.error err if err? - ) + User.update {_id: userID}, {$inc: {points: earnedPoints}}, {}, (err, count) -> + log.error err if err? if isRepeatable - log.debug 'Upserting repeatable achievement called \'' + (achievement.get 'name') + '\' for ' + userID + #log.debug 'Upserting repeatable achievement called \'' + (achievement.get 'name') + '\' for ' + userID proportionalTo = achievement.get 'proportionalTo' - originalAmount = util.getByPath(originalDocObj, proportionalTo) or 0 + originalAmount = if originalDocObj then util.getByPath(originalDocObj, proportionalTo) or 0 else 0 newAmount = docObj[proportionalTo] if originalAmount isnt newAmount @@ -69,28 +74,17 @@ module.exports = AchievablePlugin = (schema, options) -> return log.debug err if err? earnedPoints = earned.earnedPoints - log.debug earnedPoints + #log.debug earnedPoints wrapUp() else # not alreadyAchieved - log.debug 'Creating a new earned achievement called \'' + (achievement.get 'name') + '\' for ' + userID + #log.debug 'Creating a new earned achievement called \'' + (achievement.get 'name') + '\' for ' + userID earned.earnedPoints = worth (new EarnedAchievement(earned)).save (err, doc) -> - return log.debug err if err? + return log.error err if err? earnedPoints = worth wrapUp() - delete before[doc.id] unless isNew # This assumes everything we patch has a _id - return + delete before[doc.id] if doc.id of before -module.exports.loadAchievements = -> - achievements = {} - Achievement = require '../achievements/Achievement' - query = Achievement.find({}) - query.exec (err, docs) -> - _.each docs, (achievement) -> - category = achievement.get 'collection' - achievements[category] = [] unless category of achievements - achievements[category].push achievement - -AchievablePlugin.loadAchievements() +module.exports = AchievablePlugin diff --git a/server/plugins/plugins.coffee b/server/plugins/plugins.coffee index 7d7911ae2..918055042 100644 --- a/server/plugins/plugins.coffee +++ b/server/plugins/plugins.coffee @@ -1,5 +1,7 @@ -mongoose = require 'mongoose' -textSearch = require 'mongoose-text-search' +mongoose = require('mongoose') +textSearch = require('mongoose-text-search') +log = require 'winston' +utils = require '../lib/utils' module.exports.MigrationPlugin = (schema, migrations) -> # Property name migrations made EZ @@ -30,9 +32,13 @@ module.exports.NamedPlugin = (schema) -> schema.add({name: String, slug: String}) schema.index({'slug': 1}, {unique: true, sparse: true, name: 'slug index'}) - schema.statics.getBySlug = (slug, done) -> + schema.statics.findBySlug = (slug, done) -> @findOne {slug: slug}, done + schema.statics.findBySlugOrId = (slugOrID, done) -> + return @findById slugOrID, done if utils.isID slugOrID + @findOne {slug: slugOrID}, done + schema.pre('save', (next) -> if schema.uses_coco_versions v = @get('version') @@ -260,6 +266,15 @@ module.exports.VersionedPlugin = (schema) -> ) ) + # Assume every save is a new version, hence an edit + schema.pre 'save', (next) -> + User = require '../users/User' # Avoid mutual inclusion cycles + userID = @get('creator')?.toHexString() + return next() unless userID? + + statName = User.statsMapping.edits[@constructor.modelName] + User.incrementStat userID, statName, next + module.exports.SearchablePlugin = (schema, options) -> # this plugin must be added only after the others (specifically Versioned and Permissions) # have been added, as how it builds the text search index depends on which of those are used. diff --git a/server/routes/admin.coffee b/server/routes/admin.coffee index c15b3cc05..c27f154e3 100644 --- a/server/routes/admin.coffee +++ b/server/routes/admin.coffee @@ -13,14 +13,16 @@ module.exports.setup = (app) -> parts = module.split('/') module = parts[0] - return errors.unauthorized(res, 'Must be admin to access this area.') unless req.user?.isAdmin() + return errors.forbidden(res, 'Admins only') unless req.user?.isAdmin() try moduleName = module.replace '.', '_' name = handlers[moduleName] - handler = require('../' + name) + return errors.notFound res, 'Handler not found for ' + moduleName unless name? + handler = require('../' + name) return handler[parts[1]](req, res, parts[2..]...) if parts[1] of handler + return errors.notFound res, 'Method not found for handler ' + name catch error log.error("Error trying db method '#{req.route.method}' route '#{parts}' from #{name}: #{error}") diff --git a/server/routes/db.coffee b/server/routes/db.coffee index 5b4ae3b17..4005684ed 100644 --- a/server/routes/db.coffee +++ b/server/routes/db.coffee @@ -38,7 +38,7 @@ module.exports.setup = (app) -> return handler.getByRelationship(req, res, parts[1..]...) if parts.length > 2 return handler.getById(req, res, parts[1]) if req.route.method is 'get' and parts[1]? return handler.patch(req, res, parts[1]) if req.route.method is 'patch' and parts[1]? - handler[req.route.method](req, res) + handler[req.route.method](req, res, parts[1..]...) catch error log.error("Error trying db method #{req.route.method} route #{parts} from #{name}: #{error}") log.error(error) diff --git a/server/users/User.coffee b/server/users/User.coffee index 6e1899afc..988107f9e 100644 --- a/server/users/User.coffee +++ b/server/users/User.coffee @@ -113,6 +113,38 @@ UserSchema.statics.updateMailChimp = (doc, callback) -> mc?.lists.subscribe params, onSuccess, onFailure +UserSchema.statics.statsMapping = + edits: + article: 'stats.articleEdits' + level: 'stats.levelEdits' + 'level.component': 'stats.levelComponentEdits' + 'level.system': 'stats.levelSystemEdits' + 'thang.type': 'stats.thangTypeEdits' + translations: + article: 'stats.articleTranslationPatches' + level: 'stats.levelTranslationPatches' + 'level.component': 'stats.levelComponentTranslationPatches' + 'level.system': 'stats.levelSystemTranslationPatches' + 'thang.type': 'stats.thangTypeTranslationPatches' + misc: + article: 'stats.articleMiscPatches' + level: 'stats.levelMiscPatches' + 'level.component': 'stats.levelComponentMiscPatches' + 'level.system': 'stats.levelSystemMiscPatches' + 'thang.type': 'stats.thangTypeMiscPatches' + +UserSchema.statics.incrementStat = (id, statName, done, inc=1) -> + id = mongoose.Types.ObjectId id if _.isString id + @findById id, (err, user) -> + log.error err if err? + err = new Error "Could't find user with id '#{id}'" unless user or err + return done err if err? + user.incrementStat statName, done, inc=1 + +UserSchema.methods.incrementStat = (statName, done, inc=1) -> + @set statName, (@get(statName) or 0) + inc + @save (err) -> done?(err) + UserSchema.statics.unconflictName = unconflictName = (name, done) -> User.findOne {slug: _.str.slugify(name)}, (err, otherUser) -> return done err if err? diff --git a/server/users/user_handler.coffee b/server/users/user_handler.coffee index a450951b0..c87073cd8 100644 --- a/server/users/user_handler.coffee +++ b/server/users/user_handler.coffee @@ -8,6 +8,7 @@ config = require '../../server_config' errors = require '../commons/errors' async = require 'async' log = require 'winston' +moment = require 'moment' LevelSession = require '../levels/sessions/LevelSession' LevelSessionHandler = require '../levels/sessions/level_session_handler' EarnedAchievement = require '../achievements/EarnedAchievement' @@ -183,6 +184,7 @@ UserHandler = class UserHandler extends Handler return @getSimulatorLeaderboard(req, res, args[0]) if args[1] is 'simulatorLeaderboard' return @getMySimulatorLeaderboardRank(req, res, args[0]) if args[1] is 'simulator_leaderboard_rank' return @getEarnedAchievements(req, res, args[0]) if args[1] is 'achievements' + return @getRecentlyPlayed(req, res, args[0]) if args[1] is 'recently_played' return @trackActivity(req, res, args[0], args[2], args[3]) if args[1] is 'track' and args[2] return @getRemark(req, res, args[0]) if args[1] is 'remark' return @sendNotFoundError(res) @@ -206,7 +208,7 @@ UserHandler = class UserHandler extends Handler @sendSuccess(res, {result: 'success'}) avatar: (req, res, id) -> - @modelClass.findById(id).exec (err, document) => + @modelClass.findBySlugOrId(id).exec (err, document) => return @sendDatabaseError(res, err) if err return @sendNotFoundError(res) unless document photoURL = document?.get('photoURL') @@ -230,7 +232,7 @@ UserHandler = class UserHandler extends Handler IDify: (idOrSlug, done) -> return done null, idOrSlug if Handler.isID idOrSlug - User.getBySlug idOrSlug, (err, user) -> done err, user?.get '_id' + User.findBySlug idOrSlug, (err, user) -> done err, user?.get '_id' getLevelSessions: (req, res, userIDOrSlug) -> @IDify userIDOrSlug, (err, userID) => @@ -243,8 +245,10 @@ UserHandler = class UserHandler extends Handler projection[field] = 1 for field in req.query.project.split(',') when isAuthorized or not (field in LevelSessionHandler.privateProperties) else unless isAuthorized projection[field] = 0 for field in LevelSessionHandler.privateProperties + sort = {} + sort.changed = req.query.order if req.query.order - LevelSession.find(query).select(projection).exec (err, documents) => + LevelSession.find(query).select(projection).sort(sort).exec (err, documents) => return @sendDatabaseError(res, err) if err documents = (LevelSessionHandler.formatEntity(req, doc) for doc in documents) @sendSuccess(res, documents) @@ -263,6 +267,13 @@ UserHandler = class UserHandler extends Handler doc.save() @sendSuccess(res, cleandocs) + getRecentlyPlayed: (req, res, userID) -> + twoWeeksAgo = moment().subtract('days', 14).toDate() + LevelSession.find(creator: userID, changed: $gt: twoWeeksAgo).sort(changed: -1).exec (err, docs) => + return @sendDatabaseError res, err if err? + cleandocs = (@formatEntity(req, doc) for doc in docs) + @sendSuccess res, cleandocs + trackActivity: (req, res, userID, activityName, increment=1) -> return @sendMethodNotAllowed res unless req.method is 'POST' isMe = userID is req.user._id + '' @@ -377,4 +388,170 @@ UserHandler = class UserHandler extends Handler return @sendNotFoundError res unless remark? @sendSuccess res, remark + countEdits = (model, done) -> + statKey = User.statsMapping.edits[model.modelName] + return done(new Error 'Could not resolve statKey for model') unless statKey? + User.find {}, (err, users) -> + async.eachSeries users, ((user, doneWithUser) -> + userObjectID = user.get('_id') + userStringID = userObjectID.toHexString() + + model.count {$or: [creator: userObjectID, creator: userStringID]}, (err, count) -> + if count + update = $set: {} + update.$set[statKey] = count + else + update = $unset: {} + update.$unset[statKey] = '' + User.findByIdAndUpdate user.get('_id'), update, (err) -> + log.error err if err? + doneWithUser() + ), done + + # I don't like leaking big variables, could remove this for readability + # Meant for passing into MongoDB + {isMiscPatch, isTranslationPatch} = do -> + deltas = require '../../app/lib/deltas' + + isMiscPatch: (obj) -> + expanded = deltas.flattenDelta obj.get 'delta' + _.some expanded, (delta) -> 'i18n' not in delta.dataPath + isTranslationPatch: (obj) -> + expanded = deltas.flattenDelta obj.get 'delta' + _.some expanded, (delta) -> 'i18n' in delta.dataPath + + Patch = require '../patches/Patch' + # filter is passed a mongoose document and should return a boolean, + # determining whether the patch should be counted + countPatchesByUsersInMemory = (query, filter, statName, done) -> + updateUser = (user, count, doneUpdatingUser) -> + method = if count then '$set' else '$unset' + update = {} + update[method] = {} + update[method][statName] = count or '' + User.findByIdAndUpdate user.get('_id'), update, doneUpdatingUser + + User.find {}, (err, users) -> + async.eachSeries users, ((user, doneWithUser) -> + userObjectID = user.get '_id' + userStringID = userObjectID.toHexString() + # Extend query with a patch ownership test + _.extend query, {$or: [{creator: userObjectID}, {creator: userStringID}]} + + count = 0 + stream = Patch.where(query).stream() + stream.on 'data', (doc) -> ++count if filter doc + stream.on 'error', (err) -> + updateUser user, count, doneWithUser + log.error "Recalculating #{statName} for user #{user} stopped prematurely because of error" + stream.on 'close', -> + updateUser user, count, doneWithUser + ), done + + countPatchesByUsers = (query, statName, done) -> + Patch = require '../patches/Patch' + + User.find {}, (err, users) -> + async.eachSeries users, ((user, doneWithUser) -> + userObjectID = user.get '_id' + userStringID = userObjectID.toHexString() + # Extend query with a patch ownership test + _.extend query, {$or: [{creator: userObjectID}, {creator: userStringID}]} + + Patch.count query, (err, count) -> + method = if count then '$set' else '$unset' + update = {} + update[method] = {} + update[method][statName] = count or '' + User.findByIdAndUpdate user.get('_id'), update, doneWithUser + ), done + + statRecalculators: + gamesCompleted: (done) -> + LevelSession = require '../levels/sessions/LevelSession' + + User.find {}, (err, users) -> + async.eachSeries users, ((user, doneWithUser) -> + userID = user.get('_id').toHexString() + + LevelSession.count {creator: userID, 'state.completed': true}, (err, count) -> + update = if count then {$set: 'stats.gamesCompleted': count} else {$unset: 'stats.gamesCompleted': ''} + User.findByIdAndUpdate user.get('_id'), update, doneWithUser + ), done + + articleEdits: (done) -> + Article = require '../articles/Article' + countEdits Article, done + + levelEdits: (done) -> + Level = require '../levels/Level' + countEdits Level, done + + levelComponentEdits: (done) -> + LevelComponent = require '../levels/components/LevelComponent' + countEdits LevelComponent, done + + levelSystemEdits: (done) -> + LevelSystem = require '../levels/systems/LevelSystem' + countEdits LevelSystem, done + + thangTypeEdits: (done) -> + ThangType = require '../levels/thangs/ThangType' + countEdits ThangType, done + + patchesContributed: (done) -> + countPatchesByUsers {'status': 'accepted'}, 'stats.patchesContributed', done + + patchesSubmitted: (done) -> + countPatchesByUsers {}, 'stats.patchesSubmitted', done + + # The below need functions for filtering and are thus checked in memory + totalTranslationPatches: (done) -> + countPatchesByUsersInMemory {}, isTranslationPatch, 'stats.totalTranslationPatches', done + + totalMiscPatches: (done) -> + countPatchesByUsersInMemory {}, isMiscPatch, 'stats.totalMiscPatches', done + + articleMiscPatches: (done) -> + countPatchesByUsersInMemory {'target.collection': 'article'}, isMiscPatch, User.statsMapping.misc.article, done + + levelMiscPatches: (done) -> + countPatchesByUsersInMemory {'target.collection': 'level'}, isMiscPatch, User.statsMapping.misc.level, done + + levelComponentMiscPatches: (done) -> + countPatchesByUsersInMemory {'target.collection': 'level_component'}, isMiscPatch, User.statsMapping.misc['level.component'], done + + levelSystemMiscPatches: (done) -> + countPatchesByUsersInMemory {'target.collection': 'level_system'}, isMiscPatch, User.statsMapping.misc['level.system'], done + + thangTypeMiscPatches: (done) -> + countPatchesByUsersInMemory {'target.collection': 'thang_type'}, isMiscPatch, User.statsMapping.misc['thang.type'], done + + articleTranslationPatches: (done) -> + countPatchesByUsersInMemory {'target.collection': 'article'}, isTranslationPatch, User.statsMapping.translations.article, done + + levelTranslationPatches: (done) -> + countPatchesByUsersInMemory {'target.collection': 'level'}, isTranslationPatch, User.statsMapping.translations.level, done + + levelComponentTranslationPatches: (done) -> + countPatchesByUsersInMemory {'target.collection': 'level_component'}, isTranslationPatch, User.statsMapping.translations['level.component'], done + + levelSystemTranslationPatches: (done) -> + countPatchesByUsersInMemory {'target.collection': 'level_system'}, isTranslationPatch, User.statsMapping.translations['level.system'], done + + thangTypeTranslationPatches: (done) -> + countPatchesByUsersInMemory {'target.collection': 'thang_type'}, isTranslationPatch, User.statsMapping.translations['thang.type'], done + + + recalculateStats: (statName, done) => + done new Error 'Recalculation handler not found' unless statName of @statRecalculators + @statRecalculators[statName] done + + recalculate: (req, res, statName) -> + return @sendForbiddenError(res) unless req.user.isAdmin() + log.debug 'recalculate' + return @sendNotFoundError(res) unless statName of @statRecalculators + @recalculateStats statName + @sendAccepted res, {} + module.exports = new UserHandler() diff --git a/server_setup.coffee b/server_setup.coffee index 30beb95aa..bb72554c4 100644 --- a/server_setup.coffee +++ b/server_setup.coffee @@ -70,6 +70,11 @@ setupMiddlewareToSendOldBrowserWarningWhenPlayersViewLevelDirectly = (app) -> return next() if req.query['try-old-browser-anyway'] or not isOldBrowser req res.sendfile(path.join(__dirname, 'public', 'index_old_browser.html')) +setupRedirectMiddleware = (app) -> + app.all '/account/profile/*', (req, res, next) -> + nameOrID = req.path.split('/')[3] + res.redirect 301, "/user/#{nameOrID}/profile" + setupTrailingSlashRemovingMiddleware = (app) -> app.use (req, res, next) -> return res.redirect 301, req.url[...-1] if req.url.length > 1 and req.url.slice(-1) is '/' @@ -81,6 +86,7 @@ exports.setupMiddleware = (app) -> setupPassportMiddleware app setupOneSecondDelayMiddleware app setupTrailingSlashRemovingMiddleware app + setupRedirectMiddleware app ###Routing function implementations### diff --git a/test/app/lib/LevelLoader.spec.coffee b/test/app/lib/LevelLoader.spec.coffee index c8d83338a..d9102a299 100644 --- a/test/app/lib/LevelLoader.spec.coffee +++ b/test/app/lib/LevelLoader.spec.coffee @@ -93,15 +93,15 @@ describe 'LevelLoader', -> jasmine.Ajax.requests.sendResponses(responses) requests = jasmine.Ajax.requests.all() urls = (r.url for r in requests) - expect('/db/thang.type/helmet/version?project=name,components' in urls).toBeTruthy() - expect('/db/thang.type/tharin/version?project=name,components' in urls).toBeTruthy() + expect('/db/thang.type/helmet/version?project=name,components,original' in urls).toBeTruthy() + expect('/db/thang.type/tharin/version?project=name,components,original' in urls).toBeTruthy() it 'loads components for the hero in the heroConfig in the LevelSession', -> new LevelLoader({supermodel:new SuperModel(), sessionID: 'id', levelID: 'id'}) responses = { '/db/level_session/id': sessionWithTharinWithHelmet - '/db/thang.type/tharin/version?project=name,components': thangTypeTharinWithHealsComponent + '/db/thang.type/tharin/version?project=name,components,original': thangTypeTharinWithHealsComponent } jasmine.Ajax.requests.sendResponses(responses) @@ -119,7 +119,7 @@ describe 'LevelLoader', -> jasmine.Ajax.requests.sendResponses(responses) requests = jasmine.Ajax.requests.all() urls = (r.url for r in requests) - expect('/db/thang.type/mace/version?project=name,components' in urls).toBeTruthy() + expect('/db/thang.type/mace/version?project=name,components,original' in urls).toBeTruthy() it 'loads components which are inherited by level thangs from thang type default components', -> new LevelLoader({supermodel:new SuperModel(), sessionID: 'id', levelID: 'id'}) @@ -143,7 +143,7 @@ describe 'LevelLoader', -> jasmine.Ajax.requests.sendResponses(responses) requests = jasmine.Ajax.requests.all() urls = (r.url for r in requests) - expect('/db/thang.type/wand/version?project=name,components' in urls).toBeTruthy() + expect('/db/thang.type/wand/version?project=name,components,original' in urls).toBeTruthy() it 'loads components for item thang types which are inherited by level thangs from thang type default equips component configs', -> new LevelLoader({supermodel:new SuperModel(), sessionID: 'id', levelID: 'id'}) @@ -151,7 +151,7 @@ describe 'LevelLoader', -> responses = '/db/level/id': levelWithShaman '/db/thang.type/names': [thangTypeShamanWithWandEquipped] - '/db/thang.type/wand/version?project=name,components': thangTypeWand + '/db/thang.type/wand/version?project=name,components,original': thangTypeWand jasmine.Ajax.requests.sendResponses(responses) requests = jasmine.Ajax.requests.all() @@ -168,4 +168,4 @@ describe 'LevelLoader', -> jasmine.Ajax.requests.sendResponses(responses) requests = jasmine.Ajax.requests.all() urls = (r.url for r in requests) - expect('/db/thang.type/wand/version?project=name,components' in urls).toBeFalsy() + expect('/db/thang.type/wand/version?project=name,components,original' in urls).toBeFalsy() diff --git a/test/app/lib/utils.spec.coffee b/test/app/lib/utils.spec.coffee index 061a9aa71..bb1ab7233 100644 --- a/test/app/lib/utils.spec.coffee +++ b/test/app/lib/utils.spec.coffee @@ -1,45 +1,48 @@ -describe 'utils library', -> +describe 'Utility library', -> util = require 'lib/utils' - beforeEach -> - this.fixture1 = - 'text': 'G\'day, Wizard! Come to practice? Well, let\'s get started...' - 'blurb': 'G\'day' - 'i18n': - 'es-419': - 'text': '¡Buenas, Hechicero! ¿Vienes a practicar? Bueno, empecemos...' - 'es-ES': - 'text': '¡Buenas Mago! ¿Vienes a practicar? Bien, empecemos...' - 'es': - 'text': '¡Buenas Mago! ¿Vienes a practicar? Muy bien, empecemos...' - 'fr': - 'text': 'S\'lut, Magicien! Venu pratiquer? Ok, bien débutons...' - 'pt-BR': - 'text': 'Bom dia, feiticeiro! Veio praticar? Então vamos começar...' - 'en': - 'text': 'Ohai Magician!' - 'de': - 'text': '\'N Tach auch, Zauberer! Kommst Du zum Üben? Dann lass uns anfangen...' - 'sv': - 'text': 'Godagens, trollkarl! Kommit för att öva? Nå, låt oss börja...' + describe 'i18n', -> + beforeEach -> + this.fixture1 = + 'text': 'G\'day, Wizard! Come to practice? Well, let\'s get started...' + 'blurb': 'G\'day' + 'i18n': + 'es-419': + 'text': '¡Buenas, Hechicero! ¿Vienes a practicar? Bueno, empecemos...' + 'es-ES': + 'text': '¡Buenas Mago! ¿Vienes a practicar? Bien, empecemos...' + 'es': + 'text': '¡Buenas Mago! ¿Vienes a practicar? Muy bien, empecemos...' + 'fr': + 'text': 'S\'lut, Magicien! Venu pratiquer? Ok, bien débutons...' + 'pt-BR': + 'text': 'Bom dia, feiticeiro! Veio praticar? Então vamos começar...' + 'en': + 'text': 'Ohai Magician!' + 'de': + 'text': '\'N Tach auch, Zauberer! Kommst Du zum Üben? Dann lass uns anfangen...' + 'sv': + 'text': 'Godagens, trollkarl! Kommit för att öva? Nå, låt oss börja...' - it 'i18n should find a valid target string', -> - expect(util.i18n(this.fixture1, 'text', 'sv')).toEqual(this.fixture1.i18n['sv'].text) - expect(util.i18n(this.fixture1, 'text', 'es-ES')).toEqual(this.fixture1.i18n['es-ES'].text) + it 'i18n should find a valid target string', -> + expect(util.i18n(this.fixture1, 'text', 'sv')).toEqual(this.fixture1.i18n['sv'].text) + expect(util.i18n(this.fixture1, 'text', 'es-ES')).toEqual(this.fixture1.i18n['es-ES'].text) - it 'i18n picks the correct fallback for a specific language', -> - expect(util.i18n(this.fixture1, 'text', 'fr-be')).toEqual(this.fixture1.i18n['fr'].text) + it 'i18n picks the correct fallback for a specific language', -> + expect(util.i18n(this.fixture1, 'text', 'fr-be')).toEqual(this.fixture1.i18n['fr'].text) - it 'i18n picks the correct fallback', -> - expect(util.i18n(this.fixture1, 'text', 'nl')).toEqual(this.fixture1.i18n['en'].text) - expect(util.i18n(this.fixture1, 'text', 'nl', 'de')).toEqual(this.fixture1.i18n['de'].text) + it 'i18n picks the correct fallback', -> + expect(util.i18n(this.fixture1, 'text', 'nl')).toEqual(this.fixture1.i18n['en'].text) + expect(util.i18n(this.fixture1, 'text', 'nl', 'de')).toEqual(this.fixture1.i18n['de'].text) - it 'i18n falls back to the default text, even for other targets (like blurb)', -> - delete this.fixture1.i18n['en'] - expect(util.i18n(this.fixture1, 'text', 'en')).toEqual(this.fixture1.text) - expect(util.i18n(this.fixture1, 'blurb', 'en')).toEqual(this.fixture1.blurb) - delete this.fixture1.blurb - expect(util.i18n(this.fixture1, 'blurb', 'en')).toEqual(null) + it 'i18n falls back to the default text, even for other targets (like blurb)', -> + delete this.fixture1.i18n['en'] + expect(util.i18n(this.fixture1, 'text', 'en')).toEqual(this.fixture1.text) + expect(util.i18n(this.fixture1, 'blurb', 'en')).toEqual(this.fixture1.blurb) + delete this.fixture1.blurb + expect(util.i18n(this.fixture1, 'blurb', 'en')).toEqual(null) - it 'i18n can fall forward if a general language is not found', -> - expect(util.i18n(this.fixture1, 'text', 'pt')).toEqual(this.fixture1.i18n['pt-BR'].text) + it 'i18n can fall forward if a general language is not found', -> + expect(util.i18n(this.fixture1, 'text', 'pt')).toEqual(this.fixture1.i18n['pt-BR'].text) + + describe 'Miscellaneous utility', -> diff --git a/test/app/models/CocoModel.spec.coffee b/test/app/models/CocoModel.spec.coffee index 7f2529466..059eeb2cf 100644 --- a/test/app/models/CocoModel.spec.coffee +++ b/test/app/models/CocoModel.spec.coffee @@ -1,4 +1,5 @@ CocoModel = require 'models/CocoModel' +utils = require 'lib/utils' class BlandClass extends CocoModel @className: 'Bland' @@ -90,3 +91,46 @@ describe 'CocoModel', -> b.patch() request = jasmine.Ajax.requests.mostRecent() expect(request).toBeUndefined() + + xdescribe 'Achievement polling', -> + NewAchievementCollection = require 'collections/NewAchievementCollection' + EarnedAchievement = require 'models/EarnedAchievement' + + # TODO: Figure out how to do debounce in tests so that this test doesn't need to use keepDoingUntil + + it 'achievements are polled upon saving a model', (done) -> + #spyOn(CocoModel, 'pollAchievements') + Backbone.Mediator.subscribe 'achievements:new', (collection) -> + Backbone.Mediator.unsubscribe 'achievements:new' + expect(collection.constructor.name).toBe('NewAchievementCollection') + done() + + b = new BlandClass({}) + res = b.save() + request = jasmine.Ajax.requests.mostRecent() + request.response(status: 200, responseText: '{}') + + collection = [] + model = + _id: "5390f7637b4d6f2a074a7bb4" + achievement: "537ce4855c91b8d1dda7fda8" + collection.push model + + utils.keepDoingUntil (ready) -> + request = jasmine.Ajax.requests.mostRecent() + achievementURLMatch = (/.*achievements\?notified=false$/).exec request.url + if achievementURLMatch + ready true + else return ready false + + request.response {status: 200, responseText: JSON.stringify collection} + + utils.keepDoingUntil (ready) -> + request = jasmine.Ajax.requests.mostRecent() + userURLMatch = (/^\/db\/user\/[a-zA-Z0-9]*$/).exec request.url + if userURLMatch + ready true + else return ready false + + request.response {status:200, responseText: JSON.stringify me} + diff --git a/test/app/models/User.spec.coffee b/test/app/models/User.spec.coffee index e69de29bb..35b87f450 100644 --- a/test/app/models/User.spec.coffee +++ b/test/app/models/User.spec.coffee @@ -0,0 +1,16 @@ +User = require 'models/User' + +describe 'UserModel', -> + it 'experience functions are correct', -> + expect(User.expForLevel(User.levelFromExp 0)).toBe 0 + expect(User.levelFromExp User.expForLevel 1).toBe 1 + expect(User.levelFromExp User.expForLevel 10).toBe 10 + expect(User.expForLevel 1).toBe 0 + expect(User.expForLevel 2).toBeGreaterThan User.expForLevel 1 + + it 'level is calculated correctly', -> + me.set 'points', 0 + expect(me.level()).toBe 1 + + me.set 'points', 50 + expect(me.level()).toBe User.levelFromExp 50 diff --git a/test/app/vendor/lodash.spec.coffee b/test/app/vendorTests/lodash.spec.coffee similarity index 100% rename from test/app/vendor/lodash.spec.coffee rename to test/app/vendorTests/lodash.spec.coffee diff --git a/test/app/views/editor/PatchModal.spec.coffee b/test/app/views/editor/PatchModal.spec.coffee new file mode 100644 index 000000000..d6c507880 --- /dev/null +++ b/test/app/views/editor/PatchModal.spec.coffee @@ -0,0 +1,19 @@ +LevelComponent = require 'models/LevelComponent' +Patch = require 'models/Patch' + +PatchModal = require 'views/editor/PatchModal' + +describe 'PatchModal', -> + describe 'acceptPatch', -> + it 'triggers LevelComponents and Systems to recompile their code', -> + levelComponent = new LevelComponent({ code: 'newList = (item.prop for item in list)', id: 'id' }) + levelComponent.markToRevert() + levelComponent.set('code', 'func = -> console.log()') + patch = new Patch({delta: levelComponent.getDelta(), target: 'id'}) + + levelComponent = new LevelComponent({ code: 'newList = (item.prop for item in list)', id: 'id' }) + levelComponent.markToRevert() + patchModal = new PatchModal(patch, levelComponent) + patchModal.render() + patchModal.acceptPatch() + expect(levelComponent.get('js').indexOf('function()')).toBeGreaterThan(-1) diff --git a/test/app/views/editor/component/ThangComponentsEditView.spec.coffee b/test/app/views/editor/component/ThangComponentsEditView.spec.coffee new file mode 100644 index 000000000..e9f25bf33 --- /dev/null +++ b/test/app/views/editor/component/ThangComponentsEditView.spec.coffee @@ -0,0 +1,61 @@ +ThangComponentEditView = require('views/editor/component/ThangComponentsEditView') +SuperModel = require('models/SuperModel') +LevelComponent = require('models/LevelComponent') + +responses = + '/db/level.component/B/version/0': { + system: 'System' + original: 'B' + majorVersion: 0 + name: 'B (depends on A)' + dependencies: [{original:'A', majorVersion: 0}] + } + '/db/level.component/A/version/0': { + system: 'System' + original: 'A' + majorVersion: 0 + name: 'A' + configSchema: { type: 'object', properties: { propA: { type: 'number' }, propB: { type: 'string' }} } + } + +componentC = new LevelComponent({ + system: 'System' + original: 'C' + majorVersion: 0 + name: 'C (depends on B)' + dependencies: [{original:'B', majorVersion: 0}] +}) +componentC.loaded = true + +describe 'ThangComponentsEditView', -> + view = null + + beforeEach (done) -> + supermodel = new SuperModel() + supermodel.registerModel(componentC) + view = new ThangComponentEditView({ components: [], supermodel: supermodel }) + jasmine.Ajax.requests.sendResponses { '/db/thang.type': [] } + _.delay -> + view.render() + view.componentsTreema.set('/', [ { original: 'C', majorVersion: 0 }]) + spyOn(window, 'noty') + done() + + it 'loads dependencies when you add a component with the left side treema', -> + success = jasmine.Ajax.requests.sendResponses(responses) + expect(success).toBeTruthy() + expect(_.size(view.subviews)).toBe(3) + + it 'adds dependencies to its components list', -> + jasmine.Ajax.requests.sendResponses(responses) + componentOriginals = (c.original for c in view.components) + expect('A' in componentOriginals).toBeTruthy() + expect('B' in componentOriginals).toBeTruthy() + expect('C' in componentOriginals).toBeTruthy() + + it 'removes components that are dependent on a removed component', -> + jasmine.Ajax.requests.sendResponses(responses) + view.components = (c for c in view.components when c.original isnt 'A') + view.onComponentsChanged() + expect(view.components.length).toBe(0) + expect(_.size(view.subviews)).toBe(0) \ No newline at end of file diff --git a/test/demo/fixtures/achievements.coffee b/test/demo/fixtures/achievements.coffee new file mode 100644 index 000000000..b54580d39 --- /dev/null +++ b/test/demo/fixtures/achievements.coffee @@ -0,0 +1,67 @@ +now = new Date() +oneDayBefore = (new Date now).setDate(now.getDate() - 1) + +module.exports.DungeonArenaStarted = DungeonArenaStarted = + _id: '53ba76249259823746b6b481' + name: 'Dungeon Arena Started' + description: 'Started playing Dungeon Arena. It was a really really hard game. So hard in fact, that this line should already be spanning' + #icon: '/images/achievements/swords-01.png' + worth: 3 + collection: 'level.session' + query: "{\"level.original\":\"dungeon-arena\"}" + userField: 'creator' + i18n: + es: + name: 'Dungeon Arenos Started' + +module.exports.Simulated = Simulated = + _id: '53ba76249259823746b6b482' + name: 'Simulated' + description: 'Simulated Games.' + worth: 1 + collection: 'users' + query: "{\"simulatedBy\":{\"$gt\":0}}" + userField: '_id' + proportionalTo: 'simulatedBy' + +module.exports.Simulated2 = Simulated2 = + _id: '53ba76249259823746b6b483' + name: 'Simulated2' + description: 'Simulated games for real.' + icon: '/images/achievements/cup-02.png' + worth: 1.5 + collection: 'users' + query: "{\"simulatedBy\":{\"$gt\":0}}" + userField: '_id' + proportionalTo: 'simulatedBy' + function: + kind: 'logarithmic' + parameters: {a: 1, b: .5, c: .5, d: 1} + +module.exports.DungeonArenaStartedEarned = DungeonArenaStartedEarned = + user: '' + achievement: DungeonArenaStarted._id + collection: DungeonArenaStarted.collection + achievementName: DungeonArenaStarted.name + created: now + changed: now + achievedAmount: 1 + earnedPoints: 3 + previouslyAchievedAmount: 0 + notified: true + +module.exports.SimulatedEarned = SimulatedEarned = + user: '' + achievement: Simulated._id + collection: Simulated.collection + achievementName: Simulated.name + created: now + changed: now + achievedAmount: 6 + earnedPoints: 6 + previouslyAchievedAmount: 5 + notified: true + + +module.exports.achievements = [DungeonArenaStarted, Simulated, Simulated2] +module.exports.earnedAchievements = [DungeonArenaStartedEarned, SimulatedEarned] diff --git a/test/demo/views/achievement/AchievementGet.demo.coffee b/test/demo/views/achievement/AchievementGet.demo.coffee new file mode 100644 index 000000000..697843c2e --- /dev/null +++ b/test/demo/views/achievement/AchievementGet.demo.coffee @@ -0,0 +1,33 @@ +CocoModel = require 'models/CocoModel' +RootView = require 'views/kinds/RootView' +utils = require 'lib/utils' +Achievement = require 'models/Achievement' +EarnedAchievement = require 'models/EarnedAchievement' +fixtures = require '../../fixtures/achievements' + +module.exports = -> + me.set 'points', 48 + me.set 'preferredLanguage', 'es' + + unlockableObj = fixtures.DungeonArenaStarted + earnedUnlockableObj = + earnedPoints: 3 + notified: false + simulated = fixtures.Simulated + earnedSimulated = + achievedAmount: 1 + earnedPoints: 1 + notified: false + + + unlockable = new Achievement unlockableObj + earnedUnlockable = new EarnedAchievement earnedUnlockableObj + simulated = new Achievement simulated + earnedSimulated = new EarnedAchievement earnedSimulated + + view = new RootView + view.render() + + view.showNewAchievement unlockable, earnedUnlockable + #view.showNewAchievement simulated, earnedSimulated + view diff --git a/test/demo/views/achievement/UserAchievements.demo.coffee b/test/demo/views/achievement/UserAchievements.demo.coffee new file mode 100644 index 000000000..3d3ff01c0 --- /dev/null +++ b/test/demo/views/achievement/UserAchievements.demo.coffee @@ -0,0 +1,29 @@ +Achievement = require 'models/Achievement' +Achievements = require 'collections/AchievementCollection' +UserAchievementsView = require 'views/user/AchievementsView' +EarnedAchievement = require 'models/EarnedAchievement' +EarnedAchievementCollection = require 'collections/EarnedAchievementCollection' + +fixtures = require '../../fixtures/achievements' + + +module.exports = -> + view = new UserAchievementsView {}, me.get '_id' + + respond = (request) -> + return unless request + if request.url.match /db\/achievement/ + request.response + status: 200 + responseText: JSON.stringify fixtures.achievements + else if request.url.match /db\/user\/[a-z0-9]*\/achievements/ + request.response + status: 200 + responseText: JSON.stringify fixtures.earnedAchievements + else + request.response + status: 404 + + _.each jasmine.Ajax.requests.all(), (request) -> respond request + + view.render() diff --git a/test/demo/views/editor/component/AddThangComponentsModal.demo.coffee b/test/demo/views/editor/component/AddThangComponentsModal.demo.coffee new file mode 100644 index 000000000..a2d5be343 --- /dev/null +++ b/test/demo/views/editor/component/AddThangComponentsModal.demo.coffee @@ -0,0 +1,160 @@ +AddThangComponentsModal = require('views/editor/component/AddThangComponentsModal') + +response = + [ + { + "_id": "53c46b06bd135abdb79a4f32", + "name": "InventorySomething", + "original": "53c46ae2bd135abdb79a4f2f", + "official": false, + "configSchema": { + "additionalProperties": false, + "type": "object" + }, + "propertyDocumentation": [], + "dependencies": [], + "code": "class AttacksSelf extends Component\n @className: 'AttacksSelf'\n chooseAction: ->\n @attack @", + "description": "This Component makes the Thang attack itself.", + "system": "inventory", + "version": { + "minor": 2, + "major": 0, + "isLatestMajor": true, + "isLatestMinor": true + } + }, + { + "_id": "538755f3cb18e70000712278", + "name": "Jitters", + "original": "530d8a70286ddc0000cc5d9d", + "official": false, + "configSchema": { + "additionalProperties": false, + "type": "object" + }, + "propertyDocumentation": [], + "dependencies": [], + "code": "class AttacksSelf extends Component\n @className: 'AttacksSelf'\n chooseAction: ->\n @attack @", + "description": "This Component makes the Thang jitter. Or, it would, if it did anything yet. (Test Component.)", + "system": "movement", + "version": { + "minor": 3, + "major": 0, + "isLatestMajor": true, + "isLatestMinor": true + } + }, + { + "_id": "538755f3cb18e70000712279", + "name": "DelaysExistence", + "original": "524cbbea3ea855e0ab00003d", + "official": false, + "configSchema": { + "additionalProperties": false, + "type": "object" + }, + "propertyDocumentation": [], + "dependencies": [], + "code": "class AttacksSelf extends Component\n @className: 'AttacksSelf'\n chooseAction: ->\n @attack @", + "description": "This Thang doesn't show up right away.", + "system": "existence", + "version": { + "minor": 25, + "major": 0, + "isLatestMajor": true, + "isLatestMinor": true + } + }, + { + "_id": "538755f3cb18e7000071227a", + "name": "RunsInCircles", + "original": "52438245ef76c3dcf5000004", + "official": false, + "configSchema": { + "additionalProperties": false, + "type": "object" + }, + "propertyDocumentation": [], + "dependencies": [], + "code": "class AttacksSelf extends Component\n @className: 'AttacksSelf'\n chooseAction: ->\n @attack @", + "description": "This Thang runs in circles.", + "system": "ai", + "version": { + "minor": 39, + "major": 0, + "isLatestMajor": true, + "isLatestMinor": true + } + }, + { + "_id": "538755f3cb18e7000071227b", + "name": "AttacksSelf", + "original": "52437b061d9e25b8dc000004", + "official": false, + "configSchema": { + "additionalProperties": false, + "type": "object" + }, + "propertyDocumentation": [], + "dependencies": [], + "code": "class AttacksSelf extends Component\n @className: 'AttacksSelf'\n chooseAction: ->\n @attack @", + "description": "This Component makes the Thang attack itself.", + "system": "ai", + "version": { + "minor": 41, + "major": 0, + "isLatestMajor": true, + "isLatestMinor": true + } + }, + { + "_id": "538755f3cb18e7000071227d", + "name": "FollowsNearestFriend", + "original": "52437e31ef76c3dcf5000002", + "official": false, + "configSchema": { + "additionalProperties": false, + "type": "object" + }, + "propertyDocumentation": [], + "dependencies": [], + "code": "class AttacksSelf extends Component\n @className: 'AttacksSelf'\n chooseAction: ->\n @attack @", + "description": "This Thang follows the nearest friend.", + "system": "ai", + "version": { + "minor": 39, + "major": 0, + "isLatestMajor": true, + "isLatestMinor": true + } + }, + { + "_id": "538755f4cb18e7000071227e", + "name": "FollowsNearest", + "original": "52437c851d9e25b8dc000008", + "official": false, + "configSchema": { + "additionalProperties": false, + "type": "object" + }, + "propertyDocumentation": [], + "dependencies": [], + "code": "class AttacksSelf extends Component\n @className: 'AttacksSelf'\n chooseAction: ->\n @attack @", + "description": "This Thang follows the nearest other Thang.", + "system": "ai", + "version": { + "minor": 39, + "major": 0, + "isLatestMajor": true, + "isLatestMinor": true + } + } + ] + + +module.exports = -> + view = new AddThangComponentsModal({skipOriginals:['52437c851d9e25b8dc000008']}) # FollowsNearest original + console.log jasmine.Ajax.requests.all() + jasmine.Ajax.requests.mostRecent().response({status: 200, responseText: JSON.stringify(response)}) + view.render() + return view \ No newline at end of file diff --git a/test/demo/views/editor/component/ThangComponentsEditView.demo.coffee b/test/demo/views/editor/component/ThangComponentsEditView.demo.coffee new file mode 100644 index 000000000..d41af9628 --- /dev/null +++ b/test/demo/views/editor/component/ThangComponentsEditView.demo.coffee @@ -0,0 +1,40 @@ +ThangComponentEditView = require('views/editor/component/ThangComponentsEditView') + +responses = + '/db/level.component/A/version/0': { + system: 'System' + original: 'A' + majorVersion: 0 + name: 'A' + configSchema: { type: 'object', properties: { propA: { type: 'number' }, propB: { type: 'string' }} } + + } + '/db/level.component/B/version/0': { + system: 'System' + original: 'B' + majorVersion: 0 + name: 'B (depends on A)' + dependencies: [{original:'A', majorVersion: 0}] + } + '/db/level.component/C/version/0': { + system: 'System' + original: 'C' + majorVersion: 0 + name: 'C (depends on B)' + dependencies: [{original:'B', majorVersion: 0}] + } + +module.exports = -> + view = new ThangComponentEditView({ + components: [ + { original: 'A', majorVersion: 0, config: {propA: 1, propB: 'string'} } + { original: 'B', majorVersion: 0 } + { original: 'C', majorVersion: 0 } + ] + }) + + view.render() + jasmine.Ajax.requests.sendResponses(responses) + view.$el.css('background', 'white') + + return view \ No newline at end of file diff --git a/test/demo/views/user/UserNotFound.demo.coffee b/test/demo/views/user/UserNotFound.demo.coffee new file mode 100644 index 000000000..73fcf1422 --- /dev/null +++ b/test/demo/views/user/UserNotFound.demo.coffee @@ -0,0 +1,9 @@ +UserAchievementsView = require 'views/user/achievements' + +module.exports = -> + view = new UserAchievementsView {}, 'thisiddoesntexist' + + userRequest = jasmine.Ajax.requests.mostRecent() + userRequest.response status: 404 + + view.render() diff --git a/test/server/functional/achievement.spec.coffee b/test/server/functional/achievement.spec.coffee index e91538fd8..8ac1ed9ef 100644 --- a/test/server/functional/achievement.spec.coffee +++ b/test/server/functional/achievement.spec.coffee @@ -4,23 +4,40 @@ unlockable = name: 'Dungeon Arena Started' description: 'Started playing Dungeon Arena.' worth: 3 - collection: 'level.session' - query: "{\"level.original\": \"dungeon-arena\"}" + collection: 'level.sessions' + query: "{\"level.original\":\"dungeon-arena\"}" userField: 'creator' + recalculable: true + +unlockable2 = _.clone unlockable +unlockable2.name = 'This one is obsolete' repeatable = name: 'Simulated' description: 'Simulated Games.' worth: 1 - collection: 'User' - query: "{\"simulatedBy\": {\"$gt\": \"0\"}}" + collection: 'users' + query: "{\"simulatedBy\":{\"$gt\":0}}" userField: '_id' proportionalTo: 'simulatedBy' + recalculable: true + +diminishing = + name: 'Simulated2' + worth: 1.5 + collection: 'users' + query: "{\"simulatedBy\":{\"$gt\":0}}" + userField: '_id' + proportionalTo: 'simulatedBy' + function: + kind: 'logarithmic' + parameters: {a: 1, b: .5, c: .5, d: 1} + recalculable: true url = getURL('/db/achievement') describe 'Achievement', -> - allowHeader = 'GET, POST, PUT, PATCH' + allowHeader = 'GET, POST, PUT, PATCH, DELETE' it 'preparing test: deleting all Achievements first', (done) -> clearModels [Achievement, EarnedAchievement, LevelSession, User], (err) -> @@ -51,13 +68,20 @@ describe 'Achievement', -> request.post {uri: url, json: repeatable}, (err, res, body) -> expect(res.statusCode).toBe(200) repeatable._id = body._id - done() + + request.post {uri: url, json: diminishing}, (err, res, body) -> + expect(res.statusCode).toBe(200) + diminishing._id = body._id + + Achievement.find {}, (err, docs) -> + expect(docs.length).toBe 3 + done() it 'can get all for ordinary users', (done) -> loginJoe -> request.get {uri: url, json: unlockable}, (err, res, body) -> expect(res.statusCode).toBe(200) - expect(body.length).toBe(2) + expect(body.length).toBe 3 done() it 'can be read by ordinary users', (done) -> @@ -74,12 +98,18 @@ describe 'Achievement', -> expect(res.headers.allow).toBe(allowHeader) done() - it 'can\'t be requested with HTTP DEL method', (done) -> - loginJoe -> - request.del {uri: url + '/' + unlockable._id}, (err, res, body) -> - expect(res.statusCode).toBe(405) - expect(res.headers.allow).toBe(allowHeader) - done() + it 'allows admins to delete achievements using DELETE', (done) -> + loginAdmin -> + request.post {uri: url, json: unlockable2}, (err, res, body) -> + expect(res.statusCode).toBe(200) + unlockable2._id = body._id + + request.del {uri: url + '/' + unlockable2._id}, (err, res, body) -> + expect(res.statusCode).toBe(204) + + request.del {uri: url + '/' + unlockable2._id}, (err, res, body) -> + expect(res.statusCode).toBe(404) + done() it 'get schema', (done) -> request.get {uri: url + '/schema'}, (err, res, body) -> @@ -89,18 +119,133 @@ describe 'Achievement', -> done() describe 'Achieving Achievements', -> + it 'wait for achievements to be loaded', (done) -> + Achievement.loadAchievements (achievements) -> + expect(Object.keys(achievements).length).toBe(2) - it 'allows users to unlock one-time Achievements', (done) -> - loginJoe (joe) -> - levelSession = + loadedAchievements = Achievement.getLoadedAchievements() + expect(Object.keys(loadedAchievements).length).toBe(2) + done() + + it 'saving an object that should trigger an unlockable achievement', (done) -> + unittest.getNormalJoe (joe) -> + session = new LevelSession + permissions: simplePermissions creator: joe._id level: original: 'dungeon-arena' + session.save (err, doc) -> + expect(err).toBeNull() + expect(doc).toBeDefined() + expect(doc.creator).toBe(session.creator) + done() - request.post {uri: getURL('/db/level.session'), json: levelSession}, (session) -> + it 'verify that an unlockable achievement has been earned', (done) -> + unittest.getNormalJoe (joe) -> + EarnedAchievement.find {}, (err, docs) -> + expect(err).toBeNull() + expect(docs.length).toBe(1) + achievement = docs[0] + expect(achievement).toBeDefined() + + expect(achievement.get 'achievement').toBe unlockable._id + expect(achievement.get 'user').toBe joe._id.toHexString() + expect(achievement.get 'notified').toBeFalsy() + expect(achievement.get 'earnedPoints').toBe unlockable.worth + expect(achievement.get 'achievedAmount').toBeUndefined() + expect(achievement.get 'previouslyAchievedAmount').toBeUndefined() + done() + + it 'saving an object that should trigger a repeatable achievement', (done) -> + unittest.getNormalJoe (joe) -> + expect(joe.get 'simulatedBy').toBeFalsy() + joe.set('simulatedBy', 2) + joe.save (err, doc) -> + expect(err).toBeNull() + done() + + it 'verify that a repeatable achievement has been earned', (done) -> + unittest.getNormalJoe (joe) -> + EarnedAchievement.find {achievementName: repeatable.name}, (err, docs) -> + expect(err).toBeNull() + expect(docs.length).toBe(1) + achievement = docs[0] + + expect(achievement.get 'achievement').toBe repeatable._id + expect(achievement.get 'user').toBe joe._id.toHexString() + expect(achievement.get 'notified').toBeFalsy() + expect(achievement.get 'earnedPoints').toBe 2 * repeatable.worth + expect(achievement.get 'achievedAmount').toBe 2 + expect(achievement.get 'previouslyAchievedAmount').toBeFalsy() + done() + + + it 'verify that the repeatable achievement with complex exp has been earned', (done) -> + unittest.getNormalJoe (joe) -> + EarnedAchievement.find {achievementName: diminishing.name}, (err, docs) -> + expect(err).toBeNull() + expect(docs.length).toBe 1 + achievement = docs[0] + + expect(achievement.get 'achievedAmount').toBe 2 + expect(achievement.get 'earnedPoints').toBe (Math.log(.5 * (2 + .5)) + 1) * diminishing.worth done() - xit 'cleaning up test: deleting all Achievements and relates', (done) -> +describe 'Recalculate Achievements', -> + EarnedAchievementHandler = require '../../../server/achievements/earned_achievement_handler' + + it 'remove earned achievements', (done) -> + clearModels [EarnedAchievement], (err) -> + expect(err).toBeNull() + EarnedAchievement.find {}, (err, earned) -> + expect(earned.length).toBe 0 + + User.update {}, {$set: {points: 0}}, {multi:true}, (err) -> + expect(err).toBeNull() + done() + + it 'can not be accessed by regular users', (done) -> + loginJoe -> request.post {uri:getURL '/admin/earned_achievement/recalculate'}, (err, res, body) -> + expect(res.statusCode).toBe 403 + done() + + it 'can recalculate a selection of achievements', (done) -> + loginAdmin -> + EarnedAchievementHandler.constructor.recalculate ['dungeon-arena-started'], -> + EarnedAchievement.find {}, (err, earnedAchievements) -> + expect(earnedAchievements.length).toBe 1 + + # Recalculate again, doesn't change a thing + EarnedAchievementHandler.constructor.recalculate ['dungeon-arena-started'], -> + EarnedAchievement.find {}, (err, earnedAchievements) -> + expect(earnedAchievements.length).toBe 1 + + unittest.getNormalJoe (joe) -> + User.findById joe.get('id'), (err, guy) -> + expect(err).toBeNull() + expect(guy.get 'points').toBe unlockable.worth + done() + + it 'can recalculate all achievements', (done) -> + loginAdmin -> + Achievement.count {}, (err, count) -> + expect(count).toBe 3 + EarnedAchievementHandler.constructor.recalculate -> + EarnedAchievement.find {}, (err, earnedAchievements) -> + expect(earnedAchievements.length).toBe 3 + unittest.getNormalJoe (joe) -> + User.findById joe.get('id'), (err, guy) -> + expect(err).toBeNull() + expect(guy.get 'points').toBe unlockable.worth + 2 * repeatable.worth + (Math.log(.5 * (2 + .5)) + 1) * diminishing.worth + done() + + it 'cleaning up test: deleting all Achievements and related', (done) -> clearModels [Achievement, EarnedAchievement, LevelSession], (err) -> expect(err).toBeNull() + + # reset achievements in memory as well + Achievement.resetAchievements() + loadedAchievements = Achievement.getLoadedAchievements() + expect(Object.keys(loadedAchievements).length).toBe(0) + done() diff --git a/test/server/functional/admin.spec.coffee b/test/server/functional/admin.spec.coffee new file mode 100644 index 000000000..96be3ef77 --- /dev/null +++ b/test/server/functional/admin.spec.coffee @@ -0,0 +1,39 @@ +common = require '../common' + +describe 'recalculate statistics', -> + url = getURL '/admin/user/recalculate/' + + it 'does not allow regular users', (done) -> + loginJoe -> + request.post {uri:url + 'gamesCompleted'}, (err, res, body) -> + expect(res.statusCode).toBe 403 + done() + + it 'responds with a 202 Accepted', (done) -> + loginAdmin -> + request.post {uri:url + 'gamesCompleted'}, (err, res, body) -> + expect(res.statusCode).toBe 202 + done() + + it 'responds with a 404 if handler not found', (done) -> + loginAdmin -> + request.post {uri:getURL '/admin/blobfish/swim'}, (err, res, body) -> + expect(res.statusCode).toBe 404 + done() + + it 'responds with a 404 if handler method not found', (done) -> + loginAdmin -> + request.post {uri:getURL '/admin/user/hammertime'}, (err, res, body) -> + expect(res.statusCode).toBe 404 + done() + + it 'responds with a 404 if recalculate method not found', (done) -> + loginAdmin -> + request.post {uri:url + 'ballsKicked'}, (err, res, body) -> + expect(res.statusCode).toBe 404 + done() + + + + + diff --git a/test/server/functional/patch.spec.coffee b/test/server/functional/patch.spec.coffee index d75c3d2cf..798032e3c 100644 --- a/test/server/functional/patch.spec.coffee +++ b/test/server/functional/patch.spec.coffee @@ -2,6 +2,9 @@ require '../common' describe '/db/patch', -> request = require 'request' + async = require 'async' + UserHandler = require '../../../server/users/user_handler' + it 'clears the db first', (done) -> clearModels [User, Article, Patch], (err) -> throw err if err @@ -110,10 +113,52 @@ describe '/db/patch', -> expect(article.get('status')).toBe 'accepted' done() - it 'does not allow the recipient to withdraw the pull request', (done) -> - statusURL = getURL("/db/patch/#{patches[0]._id}/status") - request.put {uri: statusURL, json: {status: 'withdrawn'}}, (err, res, body) -> - expect(res.statusCode).toBe(403) - Patch.findOne({}).exec (err, article) -> - expect(article.get('status')).toBe 'accepted' + it 'keeps track of amount of submitted and accepted patches', (done) -> + loginJoe (joe) -> + User.findById joe.get('_id'), (err, guy) -> + expect(err).toBeNull() + expect(guy.get 'stats.patchesSubmitted').toBe 1 + expect(guy.get 'stats.patchesContributed').toBe 1 + expect(guy.get 'stats.totalMiscPatches').toBe 1 + expect(guy.get 'stats.articleMiscPatches').toBe 1 + expect(guy.get 'stats.totalTranslationPatches').toBeUndefined() done() + + it 'recalculates amount of submitted and accepted patches', (done) -> + loginJoe (joe) -> + User.findById joe.get('_id'), (err, joe) -> + expect(joe.get 'stats.patchesSubmitted').toBe 1 + joe.update {$unset: stats: ''}, (err) -> + UserHandler.modelClass.findById joe.get('_id'), (err, joe) -> + expect(err).toBeNull() + expect(joe.get 'stats').toBeUndefined() + async.parallel [ + (done) -> UserHandler.recalculateStats 'patchesContributed', done + (done) -> UserHandler.recalculateStats 'patchesSubmitted', done + (done) -> UserHandler.recalculateStats 'totalMiscPatches', done + (done) -> UserHandler.recalculateStats 'totalTranslationPatches', done + (done) -> UserHandler.recalculateStats 'articleMiscPatches', done + ], (err) -> + expect(err).toBeNull() + UserHandler.modelClass.findById joe.get('_id'), (err, joe) -> + expect(joe.get 'stats.patchesSubmitted').toBe 1 + expect(joe.get 'stats.patchesContributed').toBe 1 + expect(joe.get 'stats.totalMiscPatches').toBe 1 + expect(joe.get 'stats.articleMiscPatches').toBe 1 + expect(joe.get 'stats.totalTranslationPatches').toBeUndefined() + done() + + it 'does not allow the recipient to withdraw the pull request', (done) -> + loginAdmin -> + statusURL = getURL("/db/patch/#{patches[0]._id}/status") + request.put {uri: statusURL, json: {status:'withdrawn'}}, (err, res, body) -> + expect(res.statusCode).toBe(403) + Patch.findOne({}).exec (err, article) -> + expect(article.get('status')).toBe 'accepted' + done() + + + + + + diff --git a/test/server/functional/user.spec.coffee b/test/server/functional/user.spec.coffee index 2bbb3a1ab..f711e5b50 100644 --- a/test/server/functional/user.spec.coffee +++ b/test/server/functional/user.spec.coffee @@ -327,5 +327,126 @@ describe 'GET /db/user', -> xit 'can fetch another user with restricted fields' +describe 'Statistics', -> + LevelSession = require '../../../server/levels/sessions/LevelSession' + Article = require '../../../server/articles/Article' + Level = require '../../../server/levels/Level' + LevelSystem = require '../../../server/levels/systems/LevelSystem' + LevelComponent = require '../../../server/levels/components/LevelComponent' + ThangType = require '../../../server/levels/thangs/ThangType' + User = require '../../../server/users/User' + UserHandler = require '../../../server/users/user_handler' + it 'keeps track of games completed', (done) -> + session = new LevelSession + name: 'Beat Gandalf' + permissions: simplePermissions + state: completed: true + unittest.getNormalJoe (joe) -> + expect(joe.get 'stats.gamesCompleted').toBeUndefined() + + session.set 'creator', joe.get 'id' + session.save (err) -> + expect(err).toBeNull() + + User.findById joe.get('id'), (err, guy) -> + expect(err).toBeNull() + expect(guy.get 'id').toBe joe.get 'id' + expect(guy.get 'stats.gamesCompleted').toBe 1 + + done() + + it 'recalculates games completed', (done) -> + unittest.getNormalJoe (joe) -> + loginAdmin -> + User.findByIdAndUpdate joe.get('id'), {$unset:'stats.gamesCompleted': ''}, (err, guy) -> + expect(err).toBeNull() + expect(guy.get 'stats.gamesCompleted').toBeUndefined() + + UserHandler.statRecalculators.gamesCompleted -> + User.findById joe.get('id'), (err, guy) -> + expect(err).toBeNull() + expect(guy.get 'stats.gamesCompleted').toBe 1 + done() + + it 'keeps track of article edits', (done) -> + article = + name: 'My very first' + body: 'I don\'t have much to say I\'m afraid' + url = getURL('/db/article') + + loginAdmin (carl) -> + expect(carl.get User.statsMapping.edits.article).toBeUndefined() + article.creator = carl.get 'id' + + # Create major version 1.0 + request.post {uri:url, json: article}, (err, res, body) -> + expect(err).toBeNull() + expect(res.statusCode).toBe 200 + article = body + + User.findById carl.get('id'), (err, guy) -> + expect(err).toBeNull() + expect(guy.get User.statsMapping.edits.article).toBe 1 + + # Create minor version 1.1 + request.post {uri:url, json: article}, (err, res, body) -> + expect(err).toBeNull() + + User.findById carl.get('id'), (err, guy) -> + expect(err).toBeNull() + expect(guy.get User.statsMapping.edits.article).toBe 2 + + done() + + it 'recalculates article edits', (done) -> + loginAdmin (carl) -> + User.findByIdAndUpdate carl.get('id'), {$unset:'stats.articleEdits': ''}, (err, guy) -> + expect(err).toBeNull() + expect(guy.get User.statsMapping.edits.article).toBeUndefined() + + UserHandler.statRecalculators.articleEdits -> + User.findById carl.get('id'), (err, guy) -> + expect(err).toBeNull() + expect(guy.get User.statsMapping.edits.article).toBe 2 + done() + + it 'keeps track of level edits', (done) -> + level = new Level + name: "King's Peak 3" + description: 'Climb a mountain.' + permissions: simplePermissions + scripts: [] + thangs: [] + + loginAdmin (carl) -> + expect(carl.get User.statsMapping.edits.level).toBeUndefined() + level.creator = carl.get 'id' + level.save (err) -> + expect(err).toBeNull() + + User.findById carl.get('id'), (err, guy) -> + expect(err).toBeNull() + expect(guy.get 'id').toBe carl.get 'id' + expect(guy.get User.statsMapping.edits.level).toBe 1 + + done() + + it 'recalculates level edits', (done) -> + unittest.getAdmin (jose) -> + User.findByIdAndUpdate jose.get('id'), {$unset:'stats.levelEdits':''}, (err, guy) -> + expect(err).toBeNull() + expect(guy.get User.statsMapping.edits.level).toBeUndefined() + + UserHandler.statRecalculators.levelEdits -> + User.findById jose.get('id'), (err, guy) -> + expect(err).toBeNull() + expect(guy.get User.statsMapping.edits.level).toBe 1 + done() + + it 'cleans up', (done) -> + clearModels [LevelSession, Article, Level, LevelSystem, LevelComponent, ThangType], (err) -> + expect(err).toBeNull() + + done() diff --git a/test/server/unit/patch.spec.coffee b/test/server/unit/patch.spec.coffee new file mode 100644 index 000000000..e7ce13ddd --- /dev/null +++ b/test/server/unit/patch.spec.coffee @@ -0,0 +1,45 @@ +require '../common' + +describe 'schema methods', -> + patch = new Patch + commitMessage: 'Accept this patch!' + editPath: '/who/knows/yes' + target: + id:null + collection: 'article' + delta: + "scripts": + "0": + "noteChain": + "1": + "sprites": + "0": + "say": + "i18n": + "nl-BE": [ "text": "aaahw yeahh" ] + "_t": "a" + "_t": "a" + "_t": "a" + "thangs": + "111": [ + "components": [ + "config": { + "stateless": true + } + ] + ] + "_t": "a" + + it 'is translation patch', -> + expect(patch.isTranslationPatch()).toBeTruthy() + patch.set 'delta.scripts', undefined + expect(patch.isTranslationPatch()).toBeFalsy() + + it 'is miscellaneous patch', -> + expect(patch.isMiscPatch()).toBeTruthy() + patch.set 'delta.thangs', undefined + expect(patch.isMiscPatch()).toBeFalsy() + + + + diff --git a/vendor/scripts/notify-combined.min.js b/vendor/scripts/notify-combined.min.js deleted file mode 100644 index bafa7af50..000000000 --- a/vendor/scripts/notify-combined.min.js +++ /dev/null @@ -1,5 +0,0 @@ -/** Notify.js - v0.3.1 - 2014/02/06 - * http://notifyjs.com/ - * Copyright (c) 2014 Jaime Pillora - MIT - */ -(function(t,i,n,e){"use strict";var o,r,s,a,l,h,c,p,u,d,f,A,m,w,g,y,b,v,x,C,S,E,M,k,H,D,F,T=[].indexOf||function(t){for(var i=0,n=this.length;n>i;i++)if(i in this&&this[i]===t)return i;return-1};S="notify",C=S+"js",s=S+"!blank",M={t:"top",m:"middle",b:"bottom",l:"left",c:"center",r:"right"},m=["l","c","r"],F=["t","m","b"],b=["t","b","l","r"],v={t:"b",m:null,b:"t",l:"r",c:null,r:"l"},x=function(t){var i;return i=[],n.each(t.split(/\W+/),function(t,n){var o;return o=n.toLowerCase().charAt(0),M[o]?i.push(o):e}),i},D={},a={name:"core",html:'
\n
\n
\n
',css:"."+C+"-corner {\n position: fixed;\n margin: 5px;\n z-index: 1050;\n}\n\n."+C+"-corner ."+C+"-wrapper,\n."+C+"-corner ."+C+"-container {\n position: relative;\n display: block;\n height: inherit;\n width: inherit;\n margin: 3px;\n}\n\n."+C+"-wrapper {\n z-index: 1;\n position: absolute;\n display: inline-block;\n height: 0;\n width: 0;\n}\n\n."+C+"-container {\n display: none;\n z-index: 1;\n position: absolute;\n cursor: pointer;\n}\n\n[data-notify-text],[data-notify-html] {\n position: relative;\n}\n\n."+C+"-arrow {\n position: absolute;\n z-index: 2;\n width: 0;\n height: 0;\n}"},H={"border-radius":["-webkit-","-moz-"]},f=function(t){return D[t]},r=function(i,e){var o,r,s,a;if(!i)throw"Missing Style name";if(!e)throw"Missing Style definition";if(!e.html)throw"Missing Style HTML";return(null!=(a=D[i])?a.cssElem:void 0)&&(t.console&&console.warn(""+S+": overwriting style '"+i+"'"),D[i].cssElem.remove()),e.name=i,D[i]=e,o="",e.classes&&n.each(e.classes,function(t,i){return o+="."+C+"-"+e.name+"-"+t+" {\n",n.each(i,function(t,i){return H[t]&&n.each(H[t],function(n,e){return o+=" "+e+t+": "+i+";\n"}),o+=" "+t+": "+i+";\n"}),o+="}\n"}),e.css&&(o+="/* styles for "+e.name+" */\n"+e.css),o&&(e.cssElem=y(o),e.cssElem.attr("id","notify-"+e.name)),s={},r=n(e.html),u("html",r,s),u("text",r,s),e.fields=s},y=function(t){var i;i=l("style"),i.attr("type","text/css"),n("head").append(i);try{i.html(t)}catch(e){i[0].styleSheet.cssText=t}return i},u=function(t,i,e){var o;return"html"!==t&&(t="text"),o="data-notify-"+t,p(i,"["+o+"]").each(function(){var i;return i=n(this).attr(o),i||(i=s),e[i]=t})},p=function(t,i){return t.is(i)?t:t.find(i)},E={clickToHide:!0,autoHide:!0,autoHideDelay:5e3,arrowShow:!0,arrowSize:5,breakNewLines:!0,elementPosition:"bottom",globalPosition:"top right",style:"bootstrap",className:"error",showAnimation:"slideDown",showDuration:400,hideAnimation:"slideUp",hideDuration:200,gap:5},g=function(t,i){var e;return e=function(){},e.prototype=t,n.extend(!0,new e,i)},h=function(t){return n.extend(E,t)},l=function(t){return n("<"+t+">")},A={},d=function(t){var i;return t.is("[type=radio]")&&(i=t.parents("form:first").find("[type=radio]").filter(function(i,e){return n(e).attr("name")===t.attr("name")}),t=i.first()),t},w=function(t,i,n){var o,r;if("string"==typeof n)n=parseInt(n,10);else if("number"!=typeof n)return;if(!isNaN(n))return o=M[v[i.charAt(0)]],r=i,t[o]!==e&&(i=M[o.charAt(0)],n=-n),t[i]===e?t[i]=n:t[i]+=n,null},k=function(t,i,n){if("l"===t||"t"===t)return 0;if("c"===t||"m"===t)return n/2-i/2;if("r"===t||"b"===t)return n-i;throw"Invalid alignment"},c=function(t){return c.e=c.e||l("div"),c.e.text(t).html()},o=function(){function t(t,i,e){"string"==typeof e&&(e={className:e}),this.options=g(E,n.isPlainObject(e)?e:{}),this.loadHTML(),this.wrapper=n(a.html),this.wrapper.data(C,this),this.arrow=this.wrapper.find("."+C+"-arrow"),this.container=this.wrapper.find("."+C+"-container"),this.container.append(this.userContainer),t&&t.length&&(this.elementType=t.attr("type"),this.originalElement=t,this.elem=d(t),this.elem.data(C,this),this.elem.before(this.wrapper)),this.container.hide(),this.run(i)}return t.prototype.loadHTML=function(){var t;return t=this.getStyle(),this.userContainer=n(t.html),this.userFields=t.fields},t.prototype.show=function(t,i){var n,o,r,s,a,l=this;if(o=function(){return t||l.elem||l.destroy(),i?i():e},a=this.container.parent().parents(":hidden").length>0,r=this.container.add(this.arrow),n=[],a&&t)s="show";else if(a&&!t)s="hide";else if(!a&&t)s=this.options.showAnimation,n.push(this.options.showDuration);else{if(a||t)return o();s=this.options.hideAnimation,n.push(this.options.hideDuration)}return n.push(o),r[s].apply(r,n)},t.prototype.setGlobalPosition=function(){var t,i,e,o,r,s,a,h;return h=this.getPosition(),a=h[0],s=h[1],r=M[a],t=M[s],o=a+"|"+s,i=A[o],i||(i=A[o]=l("div"),e={},e[r]=0,"middle"===t?e.top="45%":"center"===t?e.left="45%":e[t]=0,i.css(e).addClass(""+C+"-corner"),n("body").append(i)),i.prepend(this.wrapper)},t.prototype.setElementPosition=function(){var t,i,o,r,s,a,l,h,c,p,u,d,f,A,g,y,x,C,S,E,H,D,z,Q,B,R,N,P,U;for(z=this.getPosition(),E=z[0],C=z[1],S=z[2],u=this.elem.position(),h=this.elem.outerHeight(),d=this.elem.outerWidth(),c=this.elem.innerHeight(),p=this.elem.innerWidth(),Q=this.wrapper.position(),s=this.container.height(),a=this.container.width(),A=M[E],y=v[E],x=M[y],l={},l[x]="b"===E?h:"r"===E?d:0,w(l,"top",u.top-Q.top),w(l,"left",u.left-Q.left),U=["top","left"],B=0,N=U.length;N>B;B++)H=U[B],g=parseInt(this.elem.css("margin-"+H),10),g&&w(l,H,g);if(f=Math.max(0,this.options.gap-(this.options.arrowShow?o:0)),w(l,x,f),this.options.arrowShow){for(o=this.options.arrowSize,i=n.extend({},l),t=this.userContainer.css("border-color")||this.userContainer.css("background-color")||"white",R=0,P=b.length;P>R;R++)H=b[R],D=M[H],H!==y&&(r=D===A?t:"transparent",i["border-"+D]=""+o+"px solid "+r);w(l,M[y],o),T.call(b,C)>=0&&w(i,M[C],2*o)}else this.arrow.hide();return T.call(F,E)>=0?(w(l,"left",k(C,a,d)),i&&w(i,"left",k(C,o,p))):T.call(m,E)>=0&&(w(l,"top",k(C,s,h)),i&&w(i,"top",k(C,o,c))),this.container.is(":visible")&&(l.display="block"),this.container.removeAttr("style").css(l),i?this.arrow.removeAttr("style").css(i):e},t.prototype.getPosition=function(){var t,i,n,e,o,r,s,a;if(i=this.options.position||(this.elem?this.options.elementPosition:this.options.globalPosition),t=x(i),0===t.length&&(t[0]="b"),n=t[0],0>T.call(b,n))throw"Must be one of ["+b+"]";return(1===t.length||(e=t[0],T.call(F,e)>=0&&(o=t[1],0>T.call(m,o)))||(r=t[0],T.call(m,r)>=0&&(s=t[1],0>T.call(F,s))))&&(t[1]=(a=t[0],T.call(m,a)>=0?"m":"l")),2===t.length&&(t[2]=t[1]),t},t.prototype.getStyle=function(t){var i;if(t||(t=this.options.style),t||(t="default"),i=D[t],!i)throw"Missing style: "+t;return i},t.prototype.updateClasses=function(){var t,i;return t=["base"],n.isArray(this.options.className)?t=t.concat(this.options.className):this.options.className&&t.push(this.options.className),i=this.getStyle(),t=n.map(t,function(t){return""+C+"-"+i.name+"-"+t}).join(" "),this.userContainer.attr("class",t)},t.prototype.run=function(t,i){var o,r,a,l,h,u=this;if(n.isPlainObject(i)?n.extend(this.options,i):"string"===n.type(i)&&(this.options.className=i),this.container&&!t)return this.show(!1),e;if(this.container||t){r={},n.isPlainObject(t)?r=t:r[s]=t;for(a in r)o=r[a],l=this.userFields[a],l&&("text"===l&&(o=c(o),this.options.breakNewLines&&(o=o.replace(/\n/g,"
"))),h=a===s?"":"="+a,p(this.userContainer,"[data-notify-"+l+h+"]").html(o));return this.updateClasses(),this.elem?this.setElementPosition():this.setGlobalPosition(),this.show(!0),this.options.autoHide?(clearTimeout(this.autohideTimer),this.autohideTimer=setTimeout(function(){return u.show(!1)},this.options.autoHideDelay)):e}},t.prototype.destroy=function(){return this.wrapper.remove()},t}(),n[S]=function(t,i,e){return t&&t.nodeName||t.jquery?n(t)[S](i,e):(e=i,i=t,new o(null,i,e)),t},n.fn[S]=function(t,i){return n(this).each(function(){var e;return e=d(n(this)).data(C),e?e.run(t,i):new o(n(this),t,i)}),this},n.extend(n[S],{defaults:h,addStyle:r,pluginOptions:E,getStyle:f,insertCSS:y}),n(function(){return y(a.css).attr("id","core-notify"),n(i).on("click notify-hide","."+C+"-wrapper",function(t){var i;return i=n(this).data(C),i&&(i.options.clickToHide||"notify-hide"===t.type)?i.show(!1):e})})})(window,document,jQuery),$.notify.addStyle("bootstrap",{html:"
\n\n
",classes:{base:{"font-weight":"bold",padding:"8px 15px 8px 14px","text-shadow":"0 1px 0 rgba(255, 255, 255, 0.5)","background-color":"#fcf8e3",border:"1px solid #fbeed5","border-radius":"4px","white-space":"nowrap","padding-left":"25px","background-repeat":"no-repeat","background-position":"3px 7px"},error:{color:"#B94A48","background-color":"#F2DEDE","border-color":"#EED3D7","background-image":"url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAtRJREFUeNqkVc1u00AQHq+dOD+0poIQfkIjalW0SEGqRMuRnHos3DjwAH0ArlyQeANOOSMeAA5VjyBxKBQhgSpVUKKQNGloFdw4cWw2jtfMOna6JOUArDTazXi/b3dm55socPqQhFka++aHBsI8GsopRJERNFlY88FCEk9Yiwf8RhgRyaHFQpPHCDmZG5oX2ui2yilkcTT1AcDsbYC1NMAyOi7zTX2Agx7A9luAl88BauiiQ/cJaZQfIpAlngDcvZZMrl8vFPK5+XktrWlx3/ehZ5r9+t6e+WVnp1pxnNIjgBe4/6dAysQc8dsmHwPcW9C0h3fW1hans1ltwJhy0GxK7XZbUlMp5Ww2eyan6+ft/f2FAqXGK4CvQk5HueFz7D6GOZtIrK+srupdx1GRBBqNBtzc2AiMr7nPplRdKhb1q6q6zjFhrklEFOUutoQ50xcX86ZlqaZpQrfbBdu2R6/G19zX6XSgh6RX5ubyHCM8nqSID6ICrGiZjGYYxojEsiw4PDwMSL5VKsC8Yf4VRYFzMzMaxwjlJSlCyAQ9l0CW44PBADzXhe7xMdi9HtTrdYjFYkDQL0cn4Xdq2/EAE+InCnvADTf2eah4Sx9vExQjkqXT6aAERICMewd/UAp/IeYANM2joxt+q5VI+ieq2i0Wg3l6DNzHwTERPgo1ko7XBXj3vdlsT2F+UuhIhYkp7u7CarkcrFOCtR3H5JiwbAIeImjT/YQKKBtGjRFCU5IUgFRe7fF4cCNVIPMYo3VKqxwjyNAXNepuopyqnld602qVsfRpEkkz+GFL1wPj6ySXBpJtWVa5xlhpcyhBNwpZHmtX8AGgfIExo0ZpzkWVTBGiXCSEaHh62/PoR0p/vHaczxXGnj4bSo+G78lELU80h1uogBwWLf5YlsPmgDEd4M236xjm+8nm4IuE/9u+/PH2JXZfbwz4zw1WbO+SQPpXfwG/BBgAhCNZiSb/pOQAAAAASUVORK5CYII=)"},success:{color:"#468847","background-color":"#DFF0D8","border-color":"#D6E9C6","background-image":"url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAutJREFUeNq0lctPE0Ecx38zu/RFS1EryqtgJFA08YCiMZIAQQ4eRG8eDGdPJiYeTIwHTfwPiAcvXIwXLwoXPaDxkWgQ6islKlJLSQWLUraPLTv7Gme32zoF9KSTfLO7v53vZ3d/M7/fIth+IO6INt2jjoA7bjHCJoAlzCRw59YwHYjBnfMPqAKWQYKjGkfCJqAF0xwZjipQtA3MxeSG87VhOOYegVrUCy7UZM9S6TLIdAamySTclZdYhFhRHloGYg7mgZv1Zzztvgud7V1tbQ2twYA34LJmF4p5dXF1KTufnE+SxeJtuCZNsLDCQU0+RyKTF27Unw101l8e6hns3u0PBalORVVVkcaEKBJDgV3+cGM4tKKmI+ohlIGnygKX00rSBfszz/n2uXv81wd6+rt1orsZCHRdr1Imk2F2Kob3hutSxW8thsd8AXNaln9D7CTfA6O+0UgkMuwVvEFFUbbAcrkcTA8+AtOk8E6KiQiDmMFSDqZItAzEVQviRkdDdaFgPp8HSZKAEAL5Qh7Sq2lIJBJwv2scUqkUnKoZgNhcDKhKg5aH+1IkcouCAdFGAQsuWZYhOjwFHQ96oagWgRoUov1T9kRBEODAwxM2QtEUl+Wp+Ln9VRo6BcMw4ErHRYjH4/B26AlQoQQTRdHWwcd9AH57+UAXddvDD37DmrBBV34WfqiXPl61g+vr6xA9zsGeM9gOdsNXkgpEtTwVvwOklXLKm6+/p5ezwk4B+j6droBs2CsGa/gNs6RIxazl4Tc25mpTgw/apPR1LYlNRFAzgsOxkyXYLIM1V8NMwyAkJSctD1eGVKiq5wWjSPdjmeTkiKvVW4f2YPHWl3GAVq6ymcyCTgovM3FzyRiDe2TaKcEKsLpJvNHjZgPNqEtyi6mZIm4SRFyLMUsONSSdkPeFtY1n0mczoY3BHTLhwPRy9/lzcziCw9ACI+yql0VLzcGAZbYSM5CCSZg1/9oc/nn7+i8N9p/8An4JMADxhH+xHfuiKwAAAABJRU5ErkJggg==)"},info:{color:"#3A87AD","background-color":"#D9EDF7","border-color":"#BCE8F1","background-image":"url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QYFAhkSsdes/QAAA8dJREFUOMvVlGtMW2UYx//POaWHXg6lLaW0ypAtw1UCgbniNOLcVOLmAjHZolOYlxmTGXVZdAnRfXQm+7SoU4mXaOaiZsEpC9FkiQs6Z6bdCnNYruM6KNBw6YWewzl9z+sHImEWv+vz7XmT95f/+3/+7wP814v+efDOV3/SoX3lHAA+6ODeUFfMfjOWMADgdk+eEKz0pF7aQdMAcOKLLjrcVMVX3xdWN29/GhYP7SvnP0cWfS8caSkfHZsPE9Fgnt02JNutQ0QYHB2dDz9/pKX8QjjuO9xUxd/66HdxTeCHZ3rojQObGQBcuNjfplkD3b19Y/6MrimSaKgSMmpGU5WevmE/swa6Oy73tQHA0Rdr2Mmv/6A1n9w9suQ7097Z9lM4FlTgTDrzZTu4StXVfpiI48rVcUDM5cmEksrFnHxfpTtU/3BFQzCQF/2bYVoNbH7zmItbSoMj40JSzmMyX5qDvriA7QdrIIpA+3cdsMpu0nXI8cV0MtKXCPZev+gCEM1S2NHPvWfP/hL+7FSr3+0p5RBEyhEN5JCKYr8XnASMT0xBNyzQGQeI8fjsGD39RMPk7se2bd5ZtTyoFYXftF6y37gx7NeUtJJOTFlAHDZLDuILU3j3+H5oOrD3yWbIztugaAzgnBKJuBLpGfQrS8wO4FZgV+c1IxaLgWVU0tMLEETCos4xMzEIv9cJXQcyagIwigDGwJgOAtHAwAhisQUjy0ORGERiELgG4iakkzo4MYAxcM5hAMi1WWG1yYCJIcMUaBkVRLdGeSU2995TLWzcUAzONJ7J6FBVBYIggMzmFbvdBV44Corg8vjhzC+EJEl8U1kJtgYrhCzgc/vvTwXKSib1paRFVRVORDAJAsw5FuTaJEhWM2SHB3mOAlhkNxwuLzeJsGwqWzf5TFNdKgtY5qHp6ZFf67Y/sAVadCaVY5YACDDb3Oi4NIjLnWMw2QthCBIsVhsUTU9tvXsjeq9+X1d75/KEs4LNOfcdf/+HthMnvwxOD0wmHaXr7ZItn2wuH2SnBzbZAbPJwpPx+VQuzcm7dgRCB57a1uBzUDRL4bfnI0RE0eaXd9W89mpjqHZnUI5Hh2l2dkZZUhOqpi2qSmpOmZ64Tuu9qlz/SEXo6MEHa3wOip46F1n7633eekV8ds8Wxjn37Wl63VVa+ej5oeEZ/82ZBETJjpJ1Rbij2D3Z/1trXUvLsblCK0XfOx0SX2kMsn9dX+d+7Kf6h8o4AIykuffjT8L20LU+w4AZd5VvEPY+XpWqLV327HR7DzXuDnD8r+ovkBehJ8i+y8YAAAAASUVORK5CYII=)"},warn:{color:"#C09853","background-color":"#FCF8E3","border-color":"#FBEED5","background-image":"url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAMAAAC6V+0/AAABJlBMVEXr6eb/2oD/wi7/xjr/0mP/ykf/tQD/vBj/3o7/uQ//vyL/twebhgD/4pzX1K3z8e349vK6tHCilCWbiQymn0jGworr6dXQza3HxcKkn1vWvV/5uRfk4dXZ1bD18+/52YebiAmyr5S9mhCzrWq5t6ufjRH54aLs0oS+qD751XqPhAybhwXsujG3sm+Zk0PTwG6Shg+PhhObhwOPgQL4zV2nlyrf27uLfgCPhRHu7OmLgAafkyiWkD3l49ibiAfTs0C+lgCniwD4sgDJxqOilzDWowWFfAH08uebig6qpFHBvH/aw26FfQTQzsvy8OyEfz20r3jAvaKbhgG9q0nc2LbZxXanoUu/u5WSggCtp1anpJKdmFz/zlX/1nGJiYmuq5Dx7+sAAADoPUZSAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgAAAAHdElNRQfdBgUBGhh4aah5AAAAlklEQVQY02NgoBIIE8EUcwn1FkIXM1Tj5dDUQhPU502Mi7XXQxGz5uVIjGOJUUUW81HnYEyMi2HVcUOICQZzMMYmxrEyMylJwgUt5BljWRLjmJm4pI1hYp5SQLGYxDgmLnZOVxuooClIDKgXKMbN5ggV1ACLJcaBxNgcoiGCBiZwdWxOETBDrTyEFey0jYJ4eHjMGWgEAIpRFRCUt08qAAAAAElFTkSuQmCC)"}}}); \ No newline at end of file