Fix get_language_name missing language parameter (#12117)

* Fix get_language_name missing language parameter

* Code review feedback

* Fix detect-i18n error

Author: cdrini

openlibrary/macros/SearchResultsWork.html

@@ -195,7 +195,8 @@ <h3 itemprop="name" class="booktitle">
             </span>
           $if doc.get('languages') and doc_type in ['infogami_work', 'solr_work']:
             <span class="languages">
-              $ langs = [get_language_name(lang.key if hasattr(lang, 'key') else '/languages' + lang) for lang in doc.languages]
+              $ user_lang = get_lang() or 'en'
+              $ langs = [get_language_name(lang.key if hasattr(lang, 'key') else '/languages/' + lang, user_lang) for lang in doc.languages]
               $:ungettext('in <a class="hoverlink" title="%(langs)s">%(count)d language</a>', 'in <a class="hoverlink" title="%(langs)s">%(count)d languages</a>', len(doc.languages), count=len(doc.languages), langs=commify_list(langs))
             </span>
         </span>

openlibrary/plugins/upstream/utils.py

@@ -1185,7 +1185,7 @@ def get_marc21_language(language: str) -> str | None:
 
 @public
 def get_language_name(
-    lang_or_key: "Nothing | str | Thing", user_lang: str = 'en'
+    lang_or_key: "Nothing | str | Thing", user_lang: str
 ) -> Nothing | str:
     if isinstance(lang_or_key, str):
         lang = get_language(lang_or_key)

openlibrary/templates/books/edit/edition.html

@@ -263,8 +263,9 @@
                     <span class="tip"></span>
                 </div>
                 $if book.languages:
+                    $ user_lang = get_lang() or 'en'
                     $for i, lang in enumerate(book.languages):
-                        $:render_language_field(i, lang, get_language_name(lang))
+                        $:render_language_field(i, lang, get_language_name(lang, user_lang))
                 $else:
                     $:render_language_field(0, storage(name="", key=""), None)
                 <a href="javascript:;" class="mia__add small">$_('Add another language?')</a>
@@ -307,8 +308,9 @@
                         <label for="edition-translated_from"><span class="tip">$_("What language was the original written in?")</span></label>
                     </div>
                     $if book.translated_from:
+                        $ user_lang = get_lang() or 'en'
                         $for i, lang in enumerate(book.translated_from):
-                            $:render_translated_from_language_field(i, lang, get_language_name(lang))
+                            $:render_translated_from_language_field(i, lang, get_language_name(lang, user_lang))
                     $else:
                         $:render_translated_from_language_field(0, storage(name="", key=""), None)
                 </div>

openlibrary/templates/books/edition-sort.html

@@ -64,7 +64,8 @@
           <!-- Formats are store as a raw string -->
           $book.physical_format.replace('[', '').replace(']','')
           $if book.languages:
-            $:_('in %(languagelist)s', languagelist=commify_list(websafe(get_language_name(l.key)) for l in book.languages))
+            $ user_lang = get_lang() or 'en'
+            $:_('in %(languagelist)s', languagelist=commify_list(websafe(get_language_name(l.key, user_lang)) for l in book.languages))
           $if book.edition_name:
             - $book.edition_name
         </div>

openlibrary/templates/type/edition/view.html

@@ -324,10 +324,11 @@
       $if previews and any([len(e.languages) for e in previews]):
         <p class="preview-languages">
           Previews available in:
+          $ user_lang = get_lang() or 'en'
           $for e in previews:
             $if e.languages[0].name not in seen:
               $ seen.add(e.languages[0].name)
-              <a href="$work.key?edition=$(e.ocaid)">$get_language_name(e.languages[0].key)</a>
+              <a href="$work.key?edition=$(e.ocaid)">$get_language_name(e.languages[0].key, user_lang)</a>
         </p>
 
     <div class="subjects">

openlibrary/templates/type/language/repr.html

@@ -1,2 +1,3 @@
 $def with (page)
-<a href="$page.key">$get_language_name(page.key)</a>
+$ user_lang = get_lang() or 'en'
+<a href="$page.key">$get_language_name(page.key, user_lang)</a>