From 041494a8fa882035a21951a5668d63da90b3574c Mon Sep 17 00:00:00 2001 From: Braulio Bhavamitra Date: Mon, 2 Feb 2015 15:03:02 -0300 Subject: [PATCH] metadata: Use alternate languages from article --- app/models/article.rb | 4 ++++ plugins/metadata/lib/ext/article.rb | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/models/article.rb b/app/models/article.rb index 3ece08c..7b13218 100644 --- a/app/models/article.rb +++ b/app/models/article.rb @@ -390,6 +390,10 @@ class Article < ActiveRecord::Base {} end + def alternate_languages + self.translations.map(&:language) + end + scope :native_translations, :conditions => { :translation_of_id => nil } def translatable? diff --git a/plugins/metadata/lib/ext/article.rb b/plugins/metadata/lib/ext/article.rb index 1a0aa83..435d6b9 100644 --- a/plugins/metadata/lib/ext/article.rb +++ b/plugins/metadata/lib/ext/article.rb @@ -15,8 +15,8 @@ class Article see_also: [], site_name: proc{ |a, c| a.profile.name }, updated_time: proc{ |a, c| a.updated_at.iso8601 }, - 'locale:locale' => proc{ |a, c| a.environment.default_language }, - 'locale:alternate' => proc{ |a, c| a.environment.languages - [a.environment.default_language] }, + 'locale:locale' => proc{ |a, c| a.language || a.environment.default_language }, + 'locale:alternate' => proc{ |a, c| a.alternate_languages }, description: proc{ |a, plugin| ActionView::Base.full_sanitizer.sanitize a.body }, rich_attachment: "", -- libgit2 0.21.2