diff --git a/app/locale/fr.coffee b/app/locale/fr.coffee index 7515efb85..60d6a4acf 100644 --- a/app/locale/fr.coffee +++ b/app/locale/fr.coffee @@ -373,7 +373,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t regeneration: "Régénération" range: "Portée" # As in "attack or visual range" blocks: "Absorbe" # As in "this shield blocks this much damage" -# backstab: "Backstab" # As in "this dagger does this much backstab damage" + backstab: "Poignardé" # As in "this dagger does this much backstab damage" skills: "Compétences" available_for_purchase: "Disponible à l'achat" # Shows up when you have unlocked, but not purchased, a hero in the hero store level_to_unlock: "Niveau à débloquer:" # Label for which level you have to beat to unlock a particular hero (click a locked hero in the store to see) @@ -383,7 +383,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t # writable: "writable" # Hover over "attack" in Your Skills while playing a level to see most of this read_only: "lecture seulement" action_name: "nom" -# action_cooldown: "Takes" + action_cooldown: "Encaisse" #Takes action_specific_cooldown: "Rechargement" action_damage: "Dégat" action_range: "Portée" @@ -819,13 +819,13 @@ module.exports = nativeDescription: "français", englishDescription: "French", t service: "Service" price: "Prix" gems: "Gemmes" -# active: "Active" -# subscribed: "Subscribed" -# unsubscribed: "Unsubscribed" -# active_until: "Active Until" -# cost: "Cost" -# next_payment: "Next Payment" -# card: "Card" + active: "Actif" + subscribed: "Inscrit" + unsubscribed: "Désincrit" + active_until: "Actif jusqu'à" + cost: "Coût" + next_payment: "Prochain paiment" + card: "Carte" status_unsubscribed_active: "Vous n'êtes pas inscrit et ne serez pas facturé, mais votre compte est toujours actif." status_unsubscribed: "Obtenez l'accès à de nouveaux niveaux, héros, objets et gemmes en bonu avec une inscription à CodeCombat !" @@ -886,7 +886,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t clas: "CLAs" play_counts: "Nombre de parties" feedback: "Réaction" -# payment_info: "Payment Info" + payment_info: "Info paiement" delta: added: "Ajouté" diff --git a/app/views/core/RootView.coffee b/app/views/core/RootView.coffee index a1d095f96..879fa3b9f 100644 --- a/app/views/core/RootView.coffee +++ b/app/views/core/RootView.coffee @@ -37,6 +37,7 @@ module.exports = class RootView extends CocoView showNewAchievement: (achievement, earnedAchievement) -> return if achievement.get('collection') is 'level.sessions' + return if @isIE() # Some bugs in IE right now, TODO fix soon! popup = new AchievementPopup achievement: achievement, earnedAchievement: earnedAchievement handleNewAchievements: (e) -> diff --git a/app/views/play/level/PlayLevelView.coffee b/app/views/play/level/PlayLevelView.coffee index e852c38f8..1a6f99f90 100644 --- a/app/views/play/level/PlayLevelView.coffee +++ b/app/views/play/level/PlayLevelView.coffee @@ -259,6 +259,8 @@ module.exports = class PlayLevelView extends RootView @bus = LevelBus.get(@levelID, @session.id) @bus.setSession(@session) @bus.setSpells @tome.spells + if @session.get('multiplayer') and not me.isAdmin() + @session.set 'multiplayer', false # Temp: multiplayer has bugged out some sessions, so ignoring it. @bus.connect() if @session.get('multiplayer') # Load Completed Setup ###################################################### diff --git a/app/views/play/menu/GameMenuModal.coffee b/app/views/play/menu/GameMenuModal.coffee index 85cf63ab0..53ae1fff4 100644 --- a/app/views/play/menu/GameMenuModal.coffee +++ b/app/views/play/menu/GameMenuModal.coffee @@ -34,6 +34,7 @@ module.exports = class GameMenuModal extends ModalView submenus = ["options", "save-load", "guide", "multiplayer"] submenus = _.without submenus, 'guide' unless docs.specificArticles?.length or docs.generalArticles?.length submenus = _.without submenus, 'save-load' unless me.isAdmin() or /https?:\/\/localhost/.test(window.location.href) + submenus = _.without submenus, 'multiplayer' unless me.isAdmin() or @level?.get('type') in ['ladder', 'hero-ladder'] context.showTab = @options.showTab ? submenus[0] context.submenus = submenus context.iconMap = diff --git a/test/server/functional/user.spec.coffee b/test/server/functional/user.spec.coffee index 265f6e7a0..0c3f23ab2 100644 --- a/test/server/functional/user.spec.coffee +++ b/test/server/functional/user.spec.coffee @@ -69,7 +69,7 @@ describe 'POST /db/user', -> expect(user.get('password')).toBeUndefined() expect(user?.get('passwordHash')).not.toBeUndefined() if user?.get('passwordHash')? - expect(user.get('passwordHash')[..5]).toBe('31dc3d') + expect(user.get('passwordHash')[..5] in ['31dc3d', '948c7e']).toBeTruthy() expect(user.get('permissions').length).toBe(0) done()