Merge pull request from mewtaylor/hotfix/localized-pdfs-bug

[Master] Fix GH-1059: Still build url localization for languages with none
This commit is contained in:
Matthew Taylor 2016-11-21 17:30:03 -05:00 committed by GitHub
commit e4c82ab55f
2 changed files with 5 additions and 4 deletions

View file

@ -120,11 +120,12 @@ for (var v in routes) {
localizedAssetUrls[routes[v].name] = {};
var assetUrls = require(l10nStatic);
for (var lang in localizedUrls) {
for (var lang in languages) {
localizedAssetUrls[routes[v].name][lang] = {};
var langUrls = localizedUrls[lang] || {};
for (var key in assetUrls) {
if (localizedUrls[lang].hasOwnProperty(key)) {
localizedAssetUrls[routes[v].name][lang][key] = localizedUrls[lang][key];
if (langUrls.hasOwnProperty(key)) {
localizedAssetUrls[routes[v].name][lang][key] = langUrls[key];
} else {
localizedAssetUrls[routes[v].name][lang][key] = assetUrls[key];
}

View file

@ -5,7 +5,7 @@
"cards.raceLink": "/pdfs/cards/RaceGameCards.pdf",
"cards.musicLink": "/pdfs/cards/MusicCards.pdf",
"cards.hideLink": "/pdfs/cards/Hide-and-Seek-Cards.pdf",
"cards.storyLink": "/scratch.mit.edu/pdfs/cards/StoryCards.pdf",
"cards.storyLink": "/pdfs/cards/StoryCards.pdf",
"cards.dressupLink": "/pdfs/cards/DressupCards.pdf",
"cards.pongLink": "/pdfs/cards/PongCards.pdf",
"cards.danceLink": "/pdfs/cards/DanceCards.pdf",