Merge branch 'master' into 'master'

fix book language issue

http://la.thu.edu.tw/en/AcadPerm/BooksPub/Ecological-Aesthetics-Perspective-for-Coastal-Wetland-Conservation-In-Chris-Makowski-Eds-Coastal-Wetlands-53774825

See merge request !2

app/models/book.rb

@@ -164,7 +164,8 @@ class Book
       end
       value = value.join(" / ")
     when "language"
-      value = I18n.t("personal_book.#{self.language}") if !self.language.nil? rescue ""
+        value = I18n.t(self.language) if !self.language.nil? rescue ""
+#      value = I18n.t("personal_book.#{self.language}") if !self.language.nil? rescue ""
     when "publish_date", "publication_date"
       value = self.send(field).to_date.strftime("%Y-%m-%d") rescue nil
     when "file"