diff --git a/pandora/item/models.py b/pandora/item/models.py index 313725b91..13af1f0f5 100644 --- a/pandora/item/models.py +++ b/pandora/item/models.py @@ -591,7 +591,7 @@ class Item(models.Model): i = key['id'] if i == 'title': save(i, u'\n'.join([self.get('title', 'Untitled'), - self.get('originalTitle', '')])) + self.get('internationalTitle', '')])) elif i == 'rightslevel': save(i, self.level) elif i == 'filename': @@ -834,7 +834,7 @@ class Item(models.Model): current_values = [current_values] else: current_values = [] - ot = self.get('originalTitle') + ot = self.get('internationalTitle') if ot: current_values.append(ot) elif key == 'character': diff --git a/static/js/pandora/infoView.0xdb.js b/static/js/pandora/infoView.0xdb.js index 5efdadb0f..22aa2c1d3 100644 --- a/static/js/pandora/infoView.0xdb.js +++ b/static/js/pandora/infoView.0xdb.js @@ -264,8 +264,8 @@ pandora.ui.infoView = function(data) { .html( formatKey('Alternative Title' + (data.alternativeTitles.length == 1 ? '' : 's')) + data.alternativeTitles.map(function(value) { - return value[0] + (value[1] ? ' ' - + formatLight('(' + value[1] + ')') : ''); + return value[0] + (Ox.isArray(value[1]) ? ' ' + + formatLight('(' + value[1].join(', ') + ')') : ''); }).join(', ') ) .appendTo($text); @@ -574,8 +574,8 @@ pandora.ui.infoView = function(data) { title = title.replace(match[0], formatLight(match[0])); } return title + ( - data.originalTitle && data.originalTitle != title - ? ' ' + formatLight('(' + data.originalTitle + ')') : '' + data.internationalTitle && data.internationalTitle != title + ? ' ' + formatLight('(' + data.internationalTitle + ')') : '' ); }