mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-06-28 08:50:06 +02:00
setting up for locale header change
This commit is contained in:
parent
73728bc733
commit
c1e7274c72
8 changed files with 45 additions and 10 deletions
|
@ -126,6 +126,10 @@ module.exports = function(grunt) {
|
|||
latedef: false,
|
||||
// use this in mocks
|
||||
forin: false,
|
||||
// This gets annoying
|
||||
globalstrict: false,
|
||||
// for use strict warnings
|
||||
node: true,
|
||||
///////////////////////////////
|
||||
// All others are true
|
||||
//////////////////////////////
|
||||
|
|
31
src/__tests__/casperjs/locale_header_test.js
Normal file
31
src/__tests__/casperjs/locale_header_test.js
Normal file
|
@ -0,0 +1,31 @@
|
|||
var CasperUtils = require('./casperUtils').CasperUtils;
|
||||
|
||||
casper.start(
|
||||
CasperUtils.getUrl(),
|
||||
function() {
|
||||
this.test.assertTitle('Learn Git Branching');
|
||||
|
||||
casper.waitFor(CasperUtils.waits.jsMount)
|
||||
.then(CasperUtils.multiAssert(
|
||||
CasperUtils.asserts.visibleIDs([
|
||||
'commandLineHistory',
|
||||
'terminal',
|
||||
'interfaceWrapper',
|
||||
'mainVisSpace',
|
||||
'commandLineBar'
|
||||
]),
|
||||
CasperUtils.asserts.visibleSelectors([
|
||||
'div.visBackgroundColor',
|
||||
'p.commandLine'
|
||||
])
|
||||
))
|
||||
|
||||
.waitFor(CasperUtils.waits.allCommandsFinished)
|
||||
|
||||
.then(
|
||||
CasperUtils.asserts.visibleSelectors(['p.finished'])
|
||||
)
|
||||
|
||||
.then(CasperUtils.testDone);
|
||||
|
||||
}).run();
|
|
@ -1,4 +1,4 @@
|
|||
'use strict';
|
||||
"use strict";
|
||||
|
||||
var AppConstants = require('../constants/AppConstants');
|
||||
var AppDispatcher = require('../dispatcher/AppDispatcher');
|
||||
|
@ -8,7 +8,6 @@ var ActionTypes = AppConstants.ActionTypes;
|
|||
var LocaleActions = {
|
||||
|
||||
changeLocale: function(newLocale) {
|
||||
console.log('firingt his off', newLocale);
|
||||
AppDispatcher.handleViewAction({
|
||||
type: ActionTypes.CHANGE_LOCALE,
|
||||
locale: newLocale
|
||||
|
|
|
@ -311,6 +311,8 @@ function CommandUI() {
|
|||
});
|
||||
}
|
||||
|
||||
exports.changeLocaleFromHeaders = changeLocaleFromHeaders;
|
||||
|
||||
exports.getEvents = function() {
|
||||
return events;
|
||||
};
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
'use strict';
|
||||
"use strict";
|
||||
|
||||
var keyMirror = require('react/lib/keyMirror');
|
||||
|
||||
|
|
|
@ -105,20 +105,20 @@ exports.todo = function(str) {
|
|||
return str;
|
||||
};
|
||||
|
||||
var getDialog = exports.getDialog = function(obj) {
|
||||
exports.getDialog = function(obj) {
|
||||
var defaultLocale = getDefaultLocale();
|
||||
return getIntlKey(obj, 'dialog') || obj.dialog[defaultLocale];
|
||||
};
|
||||
|
||||
var getHint = exports.getHint = function(level) {
|
||||
exports.getHint = function(level) {
|
||||
return getIntlKey(level, 'hint') || str('error-untranslated');
|
||||
};
|
||||
|
||||
var getName = exports.getName = function(level) {
|
||||
exports.getName = function(level) {
|
||||
return getIntlKey(level, 'name') || str('error-untranslated');
|
||||
};
|
||||
|
||||
var getStartDialog = exports.getStartDialog = function(level) {
|
||||
exports.getStartDialog = function(level) {
|
||||
var startDialog = getIntlKey(level, 'startDialog');
|
||||
if (startDialog) { return startDialog; }
|
||||
|
||||
|
@ -137,5 +137,3 @@ var getStartDialog = exports.getStartDialog = function(level) {
|
|||
|
||||
return startCopy;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
'use strict';
|
||||
"use strict";
|
||||
|
||||
var AppConstants = require('../constants/AppConstants');
|
||||
var AppDispatcher = require('../dispatcher/AppDispatcher');
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
var _ = require('underscore');
|
||||
|
||||
var toGlobalize = {
|
||||
App: require('../app/index.js'),
|
||||
Tree: require('../visuals/tree'),
|
||||
Visuals: require('../visuals'),
|
||||
Git: require('../git'),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue