Merge branch 'master' into production

This commit is contained in:
Nick Winter 2014-06-21 09:18:01 -07:00
commit 05f54a26f0
2 changed files with 107 additions and 107 deletions

View file

@ -141,7 +141,7 @@ module.exports = class Simulator extends CocoClass
console.log info console.log info
@trigger 'statusUpdate', info @trigger 'statusUpdate', info
@fetchAndSimulateOneGame() @fetchAndSimulateOneGame()
application.tracker?.trackEvent 'Simulator Result', label: "No Games" application.tracker?.trackEvent 'Simulator Result', label: "No Games", ['Google Analytics']
simulateAnotherTaskAfterDelay: => simulateAnotherTaskAfterDelay: =>
console.log "Retrying in #{@retryDelayInSeconds}" console.log "Retrying in #{@retryDelayInSeconds}"
@ -264,7 +264,7 @@ module.exports = class Simulator extends CocoClass
unless @options.headlessClient unless @options.headlessClient
simulatedBy = parseInt($('#simulated-by-you').text(), 10) + 1 simulatedBy = parseInt($('#simulated-by-you').text(), 10) + 1
$('#simulated-by-you').text(simulatedBy) $('#simulated-by-you').text(simulatedBy)
application.tracker?.trackEvent 'Simulator Result', label: "Success" application.tracker?.trackEvent 'Simulator Result', label: "Success", ['Google Analytics']
handleTaskResultsTransferError: (error) => handleTaskResultsTransferError: (error) =>
return if @destroyed return if @destroyed

View file

@ -5,12 +5,12 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
sending: "Αποστολή ..." sending: "Αποστολή ..."
# send: "Send" # send: "Send"
cancel: "Ακύρωση" cancel: "Ακύρωση"
# save: "Save" save: "Αποθήκευση"
# publish: "Publish" publish: "Δημοσιοποίηση"
# create: "Create" create: "Δημιουργία"
# delay_1_sec: "1 second" delay_1_sec: "1 δευτερόλεπτο"
# delay_3_sec: "3 seconds" delay_3_sec: "3 δευτερόλεπτα"
# delay_5_sec: "5 seconds" delay_5_sec: "5 δευτερόλεπτα"
# manual: "Manual" # manual: "Manual"
# fork: "Fork" # fork: "Fork"
# play: "Play" # play: "Play"
@ -19,21 +19,21 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
# unwatch: "Unwatch" # unwatch: "Unwatch"
# submit_patch: "Submit Patch" # submit_patch: "Submit Patch"
# units: units:
# second: "second" second: "δευτερόλεπτο"
# seconds: "seconds" seconds: "δευτερόλεπτα"
# minute: "minute" minute: "λεπτό"
# minutes: "minutes" minutes: "λεπτά"
# hour: "hour" hour: "ώρα"
# hours: "hours" hours: "ώρες"
# day: "day" day: "μέρα"
# days: "days" days: "μέρες"
# week: "week" week: "εβδομάδα"
# weeks: "weeks" weeks: "εβδομάδες"
# month: "month" month: "μήνας"
# months: "months" months: "μήνες"
# year: "year" year: "χρόνος"
# years: "years" years: "χρόνια"
modal: modal:
close: "Κλείσε" close: "Κλείσε"
@ -43,12 +43,12 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
page_not_found: "Η σελίδα δεν βρέθηκε" page_not_found: "Η σελίδα δεν βρέθηκε"
nav: nav:
# play: "Levels" # play: "Επίπεδα"
# community: "Community" # community: "Community"
# editor: "Editor" # editor: "Editor"
blog: "Μπλόγκ" blog: "Μπλόγκ"
forum: "Φόρουμ" forum: "Φόρουμ"
# account: "Account" account: "Λογαριασμός"
admin: "Διαχειριστής" admin: "Διαχειριστής"
home: "Αρχική" home: "Αρχική"
contribute: "Συμβάλλω" contribute: "Συμβάλλω"
@ -59,12 +59,12 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
# employers: "Employers" # employers: "Employers"
# versions: # versions:
# save_version_title: "Save New Version" save_version_title: "Αποθήκευση νέας έκδοσης"
# new_major_version: "New Major Version" # new_major_version: "New Major Version"
# cla_prefix: "To save changes, first you must agree to our" cla_prefix: "Για να αποθηκεύσετε, πρώτα πρέπει να συμφωνήσετε στα"
# cla_url: "CLA" # cla_url: "CLA"
# cla_suffix: "." # cla_suffix: "."
# cla_agree: "I AGREE" cla_agree: "ΣΥΜΦΩΝΩ"
login: login:
sign_up: "Δημιούργησε Λογαριασμό" sign_up: "Δημιούργησε Λογαριασμό"
@ -75,31 +75,31 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
recover: recover:
recover_account_title: "Κάντε ανάκτηση του λογαριασμού σας" recover_account_title: "Κάντε ανάκτηση του λογαριασμού σας"
# send_password: "Send Recovery Password" send_password: "Αποστολή κωδικού ανάκτησης"
signup: signup:
# create_account_title: "Create Account to Save Progress" create_account_title: "Δημιουργία λογαριασμού για αποθήκευση της προόδου"
description: "Είναι δωρεάν. Απλώς χρειάζεται να έχεις έναν λογαριασμό και θα είσαι έτοιμος να παίξεις:" description: "Είναι δωρεάν. Απλώς χρειάζεται να έχεις έναν λογαριασμό και θα είσαι έτοιμος να παίξεις:"
email_announcements: "Λαμβάνετε ανακοινώσεις μέσω e-mail" email_announcements: "Λαμβάνετε ανακοινώσεις μέσω e-mail"
coppa: "13+ ή Εκτός Αμερικής " coppa: "13+ ή Εκτός Αμερικής "
coppa_why: "(Γιάτι?)" coppa_why: "(Γιατί;)"
creating: "Δημιουργία λογαριασμού" creating: "Δημιουργία λογαριασμού"
sign_up: "Εγγραγή" sign_up: "Εγγραφή"
log_in: "Σύνδεση με κώδικο" log_in: "Σύνδεση με κωδικό"
# social_signup: "Or, you can sign up through Facebook or G+:" social_signup: "Ή, μπορείς να συνδεθείς μέσω του Facebook ή του G+:"
# required: "You need to log in before you can go that way." # required: "You need to log in before you can go that way."
home: home:
slogan: "Μάθε να προγραμμάτιζεις με JavaScript μέσω ενός παιχνιδιού" slogan: "Μάθε να προγραμμάτιζεις με JavaScript μέσω ενός παιχνιδιού"
no_ie: "Το CodeCombat δεν παίζει με το Internet Explorer 9 ή κάποια παλαιότερη έκδοση.Συγνώμη!" no_ie: "Το CodeCombat δεν παίζει με το Internet Explorer 9 ή κάποια παλαιότερη έκδοση. Συγνώμη!"
no_mobile: "Το CodeCombat δεν σχεδιάστηκε για κινητά και μπορεί να μην δουλεύει!" no_mobile: "Το CodeCombat δεν σχεδιάστηκε για κινητά και μπορεί να μην δουλεύει!"
play: "Παίξε" play: "Παίξε"
# old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!" old_browser: "Ωχ, ο περιηγητής σας είναι πολύ παλιός για να τρέξετε το CodeCombat. Συγνώμη!"
# old_browser_suffix: "You can try anyway, but it probably won't work." old_browser_suffix: "Μπορείτε να δοκιμάσετε, αλλά πιθανών να μην λειτουργήσει."
# campaign: "Campaign" campaign: "Εκστρατεία"
# for_beginners: "For Beginners" for_beginners: "Για αρχάριους"
# multiplayer: "Multiplayer" # multiplayer: "Multiplayer"
# for_developers: "For Developers" for_developers: "Για προγραμματιστές"
play: play:
choose_your_level: "Διάλεξε την πίστα σου" choose_your_level: "Διάλεξε την πίστα σου"
@ -139,21 +139,21 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
learn_more: "Μάθετε περισσότερα σχετικά με το να είστε ένας Διπλωμάτης" learn_more: "Μάθετε περισσότερα σχετικά με το να είστε ένας Διπλωμάτης"
subscribe_as_diplomat: "Εγγραφή ως Διπλωμάτης" subscribe_as_diplomat: "Εγγραφή ως Διπλωμάτης"
# wizard_settings: wizard_settings:
# title: "Wizard Settings" title: "Ρυθμίσεις Μάγου"
# customize_avatar: "Customize Your Avatar" customize_avatar: "Διαμόρφωσε το Avatar σου"
# active: "Active" active: "Ενεργό"
# color: "Color" color: "Χρώμα"
# group: "Group" group: "Ομάδα"
# clothes: "Clothes" clothes: "Ρούχα"
# trim: "Trim" # trim: "Trim"
# cloud: "Cloud" cloud: "Σύννεφο"
# team: "Team" # team: "Ομάδα"
# spell: "Spell" spell: "Ξόρκι"
# boots: "Boots" boots: "Μπότες"
# hue: "Hue" hue: "Απόχρωση"
# saturation: "Saturation" saturation: "Κορεσμός"
# lightness: "Lightness" lightness: "Φωτεινότητα"
account_settings: account_settings:
title: "Ρυθμίσεις λογαριασμού" title: "Ρυθμίσεις λογαριασμού"
@ -161,7 +161,7 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
autosave: "Οι ρυθμίσεις αποθηκεύονται αυτόματα" autosave: "Οι ρυθμίσεις αποθηκεύονται αυτόματα"
me_tab: "Εγώ" me_tab: "Εγώ"
picture_tab: "Φωτογραφία" picture_tab: "Φωτογραφία"
# upload_picture: "Upload a picture" upload_picture: "Ανέβασμα φωτογραφίας"
wizard_tab: "Μάγος" wizard_tab: "Μάγος"
password_tab: "Κωδικός" password_tab: "Κωδικός"
emails_tab: "Emails" emails_tab: "Emails"
@ -172,7 +172,7 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
email_subscriptions: "Συνδρομές Email" email_subscriptions: "Συνδρομές Email"
email_announcements: "Ανακοινώσεις" email_announcements: "Ανακοινώσεις"
email_announcements_description: "Λάβετε emails για τα τελευταία νέα και τις εξελίξεις του CodeCombat." email_announcements_description: "Λάβετε emails για τα τελευταία νέα και τις εξελίξεις του CodeCombat."
# email_notifications: "Notifications" email_notifications: "Ειδοποιήσεις"
# email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity." # email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity."
# email_any_notes: "Any Notifications" # email_any_notes: "Any Notifications"
# email_any_notes_description: "Disable to stop all activity notification emails." # email_any_notes_description: "Disable to stop all activity notification emails."
@ -193,25 +193,25 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
# view_profile: "View Your Profile" # view_profile: "View Your Profile"
account_profile: account_profile:
# settings: "Settings" settings: "Ρυθμίσεις"
# edit_profile: "Edit Profile" edit_profile: "Επεξεργασία προφίλ"
# done_editing: "Done Editing" done_editing: "Τέλος επεξεργασίας"
profile_for_prefix: "Προφίλ για " profile_for_prefix: "Προφίλ για "
# profile_for_suffix: "" # profile_for_suffix: ""
# featured: "Featured" # featured: "Featured"
# not_featured: "Not Featured" # not_featured: "Not Featured"
# looking_for: "Looking for:" looking_for: "Αναζήτηση για:"
# last_updated: "Last updated:" last_updated: "Τελευταία ενημερώθηκε:"
# contact: "Contact" contact: "Επικοινωνία"
# active: "Looking for interview offers now" # active: "Looking for interview offers now"
# inactive: "Not looking for offers right now" # inactive: "Not looking for offers right now"
# complete: "complete" complete: "Ολοκληρωμένο"
# next: "Next" next: "Επόμενο"
# next_city: "city?" next_city: "πόλη;"
# next_country: "pick your country." next_country: "επέλεξε τη χώρα σου."
# next_name: "name?" next_name: "όνομα;"
# next_short_description: "write a short description." next_short_description: "γράψε μία μικρή περιγραφή."
# next_long_description: "describe your desired position." next_long_description: "περιέγραψε την επιθυμητή σου θέση."
# next_skills: "list at least five skills." # next_skills: "list at least five skills."
# next_work: "chronicle your work history." # next_work: "chronicle your work history."
# next_education: "recount your educational ordeals." # next_education: "recount your educational ordeals."
@ -529,35 +529,35 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
# edit_btn_preview: "Preview" # edit_btn_preview: "Preview"
# edit_article_title: "Edit Article" # edit_article_title: "Edit Article"
# general: general:
# and: "and" and: "και"
# name: "Name" name: "Όνομα"
# body: "Body" # body: "Body"
# version: "Version" version: "Έκδοση"
# commit_msg: "Commit Message" # commit_msg: "Commit Message"
# version_history: "Version History" # version_history: "Version History"
# version_history_for: "Version History for: " # version_history_for: "Version History for: "
# result: "Result" result: "Αποτέλεσμα"
# results: "Results" results: "Αποτελέσματα"
# description: "Description" description: "Περιγραφή"
# or: "or" or: "ή"
# subject: "Subject" subject: "Θέμα"
# email: "Email" email: "Email"
# password: "Password" password: "Κωδικός"
# message: "Message" message: "Μήνυμα"
# code: "Code" # code: "Code"
# ladder: "Ladder" # ladder: "Ladder"
# when: "When" when: "Όταν"
# opponent: "Opponent" opponent: "Αντίπαλος"
# rank: "Rank" rank: "Κατηγορία"
# score: "Score" score: "Αποτέλεσμα"
# win: "Win" win: "Νίκη"
# loss: "Loss" loss: "Ήττα"
# tie: "Tie" tie: "Ισοπαλία"
# easy: "Easy" easy: "Εύκολο"
# medium: "Medium" medium: "Μέτριο"
# hard: "Hard" hard: "Δύσκολο"
# player: "Player" player: "Παίκτης"
# about: # about:
# who_is_codecombat: "Who is CodeCombat?" # who_is_codecombat: "Who is CodeCombat?"
@ -735,21 +735,21 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
# translating_diplomats: "Our Translating Diplomats:" # translating_diplomats: "Our Translating Diplomats:"
# helpful_ambassadors: "Our Helpful Ambassadors:" # helpful_ambassadors: "Our Helpful Ambassadors:"
# classes: classes:
# archmage_title: "Archmage" archmage_title: "Αρχιμάγος"
# archmage_title_description: "(Coder)" archmage_title_description: "(Προγραμματιστής)"
# artisan_title: "Artisan" artisan_title: "Τεχνίτης"
# artisan_title_description: "(Level Builder)" artisan_title_description: "(Δημιουργός επιπέδων)"
# adventurer_title: "Adventurer" adventurer_title: "Εξερευνητής"
# adventurer_title_description: "(Level Playtester)" adventurer_title_description: "(Δοκιματής επιπέδων)"
# scribe_title: "Scribe" scribe_title: "Γραφέας"
# scribe_title_description: "(Article Editor)" scribe_title_description: "(Συντάκτης άρθρων)"
# diplomat_title: "Diplomat" diplomat_title: "Διπλωμάτης"
# diplomat_title_description: "(Translator)" diplomat_title_description: "(Μεταφραστής)"
# ambassador_title: "Ambassador" ambassador_title: "Πρεσβευτής"
# ambassador_title_description: "(Support)" ambassador_title_description: "(Υποστήριξη)"
# counselor_title: "Counselor" counselor_title: "Σύμβουλος"
# counselor_title_description: "(Expert/Teacher)" counselor_title_description: "(Ειδικός/Δάσκαλος)"
# ladder: # ladder:
# please_login: "Please log in first before playing a ladder game." # please_login: "Please log in first before playing a ladder game."