Merge branch 'master' of github.com:ppoffice/hexo-theme-icarus into ppoffice-master

languages/fr.yml

@@ -23,7 +23,7 @@ widget:
     catalogue: 'Catalogue'
     subscribe_email: 'Abonnez-vous aux mises à jour'
     subscribe: 'Abonnez-vous'
-    adsense: 'Annonce'
+    adsense: 'Publicités'
     followit: 'follow.it'
 article:
     created_at: 'Publié il y a %s'
@@ -35,10 +35,10 @@ article:
         one: 'Environ %d mot'
         other: 'Environ %d mots'
     licensing:
-        author: 'Author'
-        created_at: 'Posted on'
-        updated_at: 'Updated on'
-        licensed_under: 'Licensed under'
+        author: 'Auteur'
+        created_at: 'Posté le'
+        updated_at: 'Mis à jour le'
+        licensed_under: 'Licencié sous'
 donate:
     title: "Vous aimez cet article? Soutenez l'auteur avec"
     afdian: 'Afdian.net'
@@ -48,19 +48,19 @@ donate:
     patreon: 'Patreon'
     buymeacoffee: 'Achetez-moi un café'
 plugin:
-    backtotop: 'Retour au sommet'
+    backtotop: 'Retour en haut'
     visit_count: '%s visites'
     visitor_count: 'Visité par %s utilisateurs'
     cookie_consent:
-      message: Ce site Web utilise des cookies pour améliorer votre expérience.
-      dismiss: Je l'ai!
-      allow: Autorise les cookies
-      deny: Déclin
-      link: Apprendre encore plus
-      policy: Politique relative aux cookies
+      message: 'Ce site Web utilise des cookies pour améliorer votre expérience.'
+      dismiss: "C'est bon"
+      allow: 'Autoriser les cookies'
+      deny: 'Refuser'
+      link: 'En savoir plus'
+      policy: 'Politique relative aux cookies'
 search:
-    search: 'Search'
-    hint: 'Type something...'
+    search: 'Rechercher'
+    hint: 'Ecrivez quelque chose...'
     no_result: 'Aucun résultat pour'
     untitled: '(Sans titre)'
     empty_preview: '(Pas de prévisualisation)'

languages/it.yml

@@ -0,0 +1,66 @@
+common:
+    archive:
+        one: 'Archivio'
+        other: 'Archivi'
+    category:
+        one: 'Categoria'
+        other: 'Categorie'
+    tag:
+        one: 'Tag'
+        other: 'Tag'
+    post:
+        one: 'Articolo'
+        other: 'Articoli'
+    page:
+        one: 'Pagina'
+        other: 'Pagine'
+    prev: 'Precedente'
+    next: 'Successivo'
+widget:
+    follow: 'Segui'
+    recents: 'Recenti'
+    links: 'Collegamenti'
+    catalogue: 'Catalogo'
+    subscribe_email: 'Iscriviti per aggiornamenti'
+    subscribe: 'Iscriviti'
+    adsense: 'Pubblicità'
+    followit: 'follow.it'
+article:
+    created_at: 'Pubblicato il %s'
+    updated_at: 'Aggiornato il %s'
+    more: 'Di più'
+    comments: 'Commenti'
+    read_time: '%s di lettura'
+    word_count:
+        one: 'Circa %d parola'
+        other: 'Circa %d parole'
+    licensing:
+        author: 'Autore'
+        created_at: 'Pubblicato il'
+        updated_at: 'Aggiornato il'
+        licensed_under: 'Licenza'
+donate:
+    title: "Ti è piaciuto questo articolo? Supporta l'autore con"
+    afdian: 'Afdian.net'
+    alipay: 'Alipay'
+    wechat: 'Wechat'
+    paypal: 'Paypal'
+    patreon: 'Patreon'
+    buymeacoffee: 'Buy me a coffee'
+plugin:
+    backtotop: 'Torna su'
+    visit_count: '%s visite'
+    visitor_count: 'Visto da %s usenti'
+    cookie_consent:
+      message: Questo sito usa i cookie per migliorare la tua esperienza.
+      dismiss: "D'accordo!"
+      allow: Accetta i cookie
+      deny: Rifiuta
+      link: Più informazioni
+      policy: Politica dei cookie
+search:
+    search: 'Cerca'
+    hint: 'Digita qualcosa...'
+    no_result: 'Nessun risultato per'
+    untitled: '(Senza titolo)'
+    empty_preview: '(Senza anteprima)'

layout/common/article.jsx

@@ -24,8 +24,10 @@ module.exports = class extends Component {
         const { article, plugins } = config;
         const { url_for, date, date_xml, __, _p } = helper;
 
-        const indexLaunguage = toMomentLocale(config.language || 'en');
-        const language = toMomentLocale(page.lang || page.language || config.language || 'en');
+        const defaultLanguage = Array.isArray(config.language) && config.language.length ? config.language[0] : config.language;
+
+        const indexLanguage = toMomentLocale(defaultLanguage || 'en');
+        const language = toMomentLocale(page.lang || page.language || defaultLanguage || 'en');
         const cover = page.cover ? url_for(page.cover) : null;
         const updateTime = article && article.update_time !== undefined ? article.update_time : true;
         const isUpdated = page.updated && !moment(page.date).isSame(moment(page.updated));
@@ -74,7 +76,7 @@ module.exports = class extends Component {
                                 {(() => {
                                     const words = getWordCount(page._content);
                                     const time = moment.duration((words / 150.0) * 60, 'seconds');
-                                    return `${_p('article.read_time', time.locale(index ? indexLaunguage : language).humanize())} (${_p('article.word_count', words)})`;
+                                    return `${_p('article.read_time', time.locale(index ? indexLanguage : language).humanize())} (${_p('article.word_count', words)})`;
                                 })()}
                             </span> : null}
                             {/* Visitor counter */}