mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-28 08:50:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Requested changes - removed underscore and sorted out duplicates in locales

Browse source
This commit is contained in:
PanAeon 2018-10-24 11:12:48 +01:00
parent 89f3a5177b
commit 9d14feb1b3
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/app/index.js
View file

@ -1,7 +1,6 @@
var Backbone = require('backbone'); var Backbone = require('backbone');
var EventEmitter = require('events').EventEmitter; var EventEmitter = require('events').EventEmitter;
var React = require('react'); var React = require('react');
var _ = require('underscore');
var assign = require('object-assign'); var assign = require('object-assign');
var util = require('../util'); var util = require('../util');
@ -93,7 +92,8 @@ var insertAlternateLinks = function(pageId) {
// The value of the hreflang attribute identifies the language (in ISO 639-1 format) // The value of the hreflang attribute identifies the language (in ISO 639-1 format)
// and optionally a region (in ISO 3166-1 Alpha 2 format) of an alternate URL // and optionally a region (in ISO 3166-1 Alpha 2 format) of an alternate URL
var altLinks = _.map(LocaleStore.getSupportedLocales(), function(langCode) {
var altLinks = LocaleStore.getSupportedLocales().map(function(langCode) {
var url = "https://learngitbranching.js.org/?locale=" + langCode; var url = "https://learngitbranching.js.org/?locale=" + langCode;
return '<link rel="alternate" hreflang="'+langCode+'" href="' + url +'" />'; return '<link rel="alternate" hreflang="'+langCode+'" href="' + url +'" />';
}); });

7
src/js/stores/LocaleStore.js
View file

@ -3,7 +3,6 @@
var AppConstants = require('../constants/AppConstants'); var AppConstants = require('../constants/AppConstants');
var AppDispatcher = require('../dispatcher/AppDispatcher'); var AppDispatcher = require('../dispatcher/AppDispatcher');
var EventEmitter = require('events').EventEmitter; var EventEmitter = require('events').EventEmitter;
var _ = require('underscore');
var assign = require('object-assign'); var assign = require('object-assign');
@ -31,7 +30,9 @@ var headerLocaleMap = {
'pt-BR': 'pt_BR' 'pt-BR': 'pt_BR'
}; };
var supportedLocalesList = _.values(langLocaleMap).concat(_.values(headerLocaleMap)); var supportedLocalesList = Object.values(langLocaleMap)
.concat(Object.values(headerLocaleMap))
.filter(function (value, index, self) { return self.indexOf(value) === index;});
function _getLocaleFromHeader(langString) { function _getLocaleFromHeader(langString) {
var languages = langString.split(','); var languages = langString.split(',');
@ -77,7 +78,7 @@ AppConstants.StoreSubscribePrototype,
}, },
getSupportedLocales: function() { getSupportedLocales: function() {
return assign({}, supportedLocalesList); return supportedLocalesList.slice();
}, },
dispatchToken: AppDispatcher.register(function(payload) { dispatchToken: AppDispatcher.register(function(payload) {