Merge pull request #1181 from Optimus-NP/kiwix-tools_issues_724

Replace multiple comma-separated languages with 'mul'

src/html_dumper.cpp

@@ -27,6 +27,30 @@ std::string humanFriendlyTitle(std::string title)
   return humanFriendlyString;
 }
 
+kainjow::mustache::object getLangTag(const std::vector<std::string>& bookLanguages) {
+  std::string langShortString = "";
+  std::string langFullString = "???";
+  
+  //if more than 1 languages then show "mul" else show the language
+  if(bookLanguages.size() > 1) {
+    std::vector<std::string> mulLanguages;
+    langShortString = "mul";
+    for (const auto& lang : bookLanguages) {
+      const std::string fullLang = getLanguageSelfName(lang);
+      mulLanguages.push_back(fullLang);
+    }
+    langFullString = kiwix::join(mulLanguages, ",");
+  } else if(bookLanguages.size() == 1) {
+    langShortString = bookLanguages[0];
+    langFullString = getLanguageSelfName(langShortString);
+  }
+  
+  kainjow::mustache::object langTag;
+    langTag["langShortString"] = langShortString;
+    langTag["langFullString"] = langFullString;
+  return langTag;
+}
+
 kainjow::mustache::list getTagList(std::string tags)
 {
   const auto tagsList = kiwix::split(tags, ";", true, false);
@@ -72,17 +96,16 @@ std::string HTMLDumper::dumpPlainHTML(kiwix::Filter filter) const
       contentId = urlEncode(nameMapper->getNameForId(bookId));
     } catch (...) {}
     const auto bookDescription = bookObj.getDescription();
-    const auto langCode = bookObj.getCommaSeparatedLanguages();
     const auto bookIconUrl = rootLocation + "/catalog/v2/illustration/" + bookId +  "/?size=48";
     const auto tags = bookObj.getTags();
     const auto downloadAvailable = (bookObj.getUrl() != "");
+    const auto langTagObj = getLangTag(bookObj.getLanguages());
     std::string faviconAttr = "style=background-image:url(" + bookIconUrl + ")";
-
     booksData.push_back(kainjow::mustache::object{
       {"id", contentId},
       {"title", bookTitle},
       {"description", bookDescription},
-      {"langCode", langCode},
+      {"langTag", langTagObj},
       {"faviconAttr", faviconAttr},
       {"tagList", getTagList(tags)},
       {"downloadAvailable", downloadAvailable}

src/tools/stringTools.h

@@ -66,6 +66,9 @@ std::string ucAll(const std::string& word);
 std::string lcAll(const std::string& word);
 std::string ucFirst(const std::string& word);
 std::string lcFirst(const std::string& word);
+
+/* This function is broken, related Github issue 
+ * https://github.com/kiwix/libkiwix/issues/1188 */ 
 std::string toTitle(const std::string& word);
 
 std::string normalize(const std::string& word);

static/templates/no_js_library_page.html

@@ -118,7 +118,7 @@
             </div>
             </a>
             <div class="book__meta">
-              <div class="book__languageTag" {{languageAttr}}>{{langCode}}</div>
+              <div class="book__languageTag" title="{{langTag.langFullString}}" aria-label="{{langTag.langFullString}}">{{langTag.langShortString}}</div>
               <div class="book__tags"><div class="book__tags--wrapper">
                   {{#tagList}}
                   <span class="tag__link" aria-label='{{tag}}' title='{{tag}}'>{{tag}}</span>

test/library_server.cpp

@@ -1251,7 +1251,7 @@ TEST_F(LibraryServerTest, no_name_mapper_catalog_v2_individual_entry_access)
   "            </div>\n" \
   "            </a>\n" \
   "            <div class=\"book__meta\">\n" \
-  "              <div class=\"book__languageTag\" >fra</div>\n" \
+  "              <div class=\"book__languageTag\" title=\"français\" aria-label=\"français\">fra</div>\n" \
   "              <div class=\"book__tags\"><div class=\"book__tags--wrapper\">\n" \
   "                  <span class=\"tag__link\" aria-label='unittest' title='unittest'>unittest</span>\n" \
   "                  <span class=\"tag__link\" aria-label='wikipedia' title='wikipedia'>wikipedia</span>\n" \
@@ -1278,7 +1278,7 @@ TEST_F(LibraryServerTest, no_name_mapper_catalog_v2_individual_entry_access)
   "            </div>\n" \
   "            </a>\n" \
   "            <div class=\"book__meta\">\n" \
-  "              <div class=\"book__languageTag\" >eng</div>\n" \
+  "              <div class=\"book__languageTag\" title=\"English\" aria-label=\"English\">eng</div>\n" \
   "              <div class=\"book__tags\"><div class=\"book__tags--wrapper\">\n" \
   "                  <span class=\"tag__link\" aria-label='public_tag_without_a_value' title='public_tag_without_a_value'>public_tag_without_a_value</span>\n" \
   "                  <span class=\"tag__link\" aria-label='wikipedia' title='wikipedia'>wikipedia</span>\n" \
@@ -1305,7 +1305,7 @@ TEST_F(LibraryServerTest, no_name_mapper_catalog_v2_individual_entry_access)
   "            </div>\n" \
   "            </a>\n" \
   "            <div class=\"book__meta\">\n" \
-  "              <div class=\"book__languageTag\" >rus,eng</div>\n" \
+  "              <div class=\"book__languageTag\" title=\"русский,English\" aria-label=\"русский,English\">mul</div>\n" \
   "              <div class=\"book__tags\"><div class=\"book__tags--wrapper\">\n" \
   "                  <span class=\"tag__link\" aria-label='public_tag_with_a_value:value_of_a_public_tag' title='public_tag_with_a_value:value_of_a_public_tag'>public_tag_with_a_value:value_of_a_public_tag</span>\n" \
   "                  <span class=\"tag__link\" aria-label='wikipedia' title='wikipedia'>wikipedia</span>\n" \