diff options
| -rw-r--r-- | content/overview-abridge/index.fr.md | 2 | ||||
| -rw-r--r-- | content/overview-abridge/index.md | 2 | ||||
| -rw-r--r-- | templates/macros/macros.html | 43 |
3 files changed, 16 insertions, 31 deletions
diff --git a/content/overview-abridge/index.fr.md b/content/overview-abridge/index.fr.md index 4905e30..b3c9208 100644 --- a/content/overview-abridge/index.fr.md +++ b/content/overview-abridge/index.fr.md @@ -294,6 +294,8 @@ js_copycode = false js_email_encode = false js_prestyle = false js_switcher = false + +pwa = false ``` Voici les fichiers javascript utilisés par Abridge : diff --git a/content/overview-abridge/index.md b/content/overview-abridge/index.md index d60be92..07b251b 100644 --- a/content/overview-abridge/index.md +++ b/content/overview-abridge/index.md @@ -295,6 +295,8 @@ js_copycode = false js_email_encode = false js_prestyle = false js_switcher = false + +pwa = false ``` These are the javascript files used by Abridge: diff --git a/templates/macros/macros.html b/templates/macros/macros.html index 9d794ee..d39b1cd 100644 --- a/templates/macros/macros.html +++ b/templates/macros/macros.html @@ -71,14 +71,9 @@ {#- Date #} {%- if config.extra.meta_post.date %} {%- if config.extra.icon_date %}<i class="{{ config.extra.icon_date }}"></i> {% endif %} - {%- if config.extra.date_locale %} - {%- if lang != config.default_language -%} - {%- set lang_locale = macros::translate(key='date_locale', default='en_US', i18n=i18n) -%} - {%- else -%} - {%- set lang_locale = config.extra.date_locale -%} - {%- endif -%} - {{ page.date | date(format="%B %d, %Y", locale=lang_locale) }} - {%- else %} {{ page.date | date(format="%B %d, %Y") }} {%- endif %} + {%- set lang_locale = macros::translate(key='date_locale', default='en_US', i18n=i18n) -%} + {%- set page_date = page.date | date(format="%B %d, %Y", locale=lang_locale) -%} + {%- if page_date %} {{ page_date }} {%- else %} {{ page.date | date(format="%B %d, %Y") }} {%- endif %} {#- divider #} {%- if config.extra.meta_post.updated or config.extra.meta_post.categories_tags %} {%- if config.extra.meta_post.divider %}<span class="hpad">{{ config.extra.meta_post.divider | safe }}</span>{%- else %} <span class="rpad"></span> {%- endif %}{%- endif %}{% endif %} @@ -86,13 +81,9 @@ {#- Updated #} {%- if config.extra.meta_post.updated and page.updated %} {%- if config.extra.icon_date %}<i class="{{ config.extra.icon_date }}"></i> {% endif -%} {{ macros::translate(key="Updated", default="Updated", i18n=i18n) }}: - {%- if config.extra.date_locale %} - {%- if lang != config.default_language -%} - {%- set lang_locale = macros::translate(key='date_locale', default='en_US', i18n=i18n) -%} - {%- else -%} - {%- set lang_locale = config.extra.date_locale -%} - {%- endif %} {{ page.updated | date(format="%B %d, %Y", locale=lang_locale) }} - {%- else %} {{ page.updated | date(format="%B %d, %Y") }} {%- endif %} + {%- set lang_locale = macros::translate(key='date_locale', default='en_US', i18n=i18n) -%} + {%- set page_updated = page.updated | date(format="%B %d, %Y", locale=lang_locale) -%} + {%- if page_updated %} {{ page_updated }} {%- else %} {{ page.updated | date(format="%B %d, %Y") }} {%- endif %} {#- divider #} {%- if config.extra.meta_post.categories_tags %} {%- if config.extra.meta_post.divider %}<span class="hpad">{{ config.extra.meta_post.divider | safe }}</span>{%- else %} <span class="rpad"></span> {%- endif %}{%- endif %}{% endif %} @@ -154,14 +145,9 @@ {#- Date #} {%- if config.extra.meta_index.date %} {%- if config.extra.icon_date %}<i class="{{ config.extra.icon_date }}"></i> {% endif %} - {%- if config.extra.date_locale %} - {%- if lang != config.default_language -%} - {%- set lang_locale = macros::translate(key='date_locale', default='en_US', i18n=i18n) -%} - {%- else -%} - {%- set lang_locale = config.extra.date_locale -%} - {%- endif -%} - {{ page.date | date(format="%B %d, %Y", locale=lang_locale) }} - {%- else %} {{ page.date | date(format="%B %d, %Y") }} {%- endif %} + {%- set lang_locale = macros::translate(key='date_locale', default='en_US', i18n=i18n) -%} + {%- set page_date = page.date | date(format="%B %d, %Y", locale=lang_locale) -%} + {%- if page_date %} {{ page_date }} {%- else %} {{ page.date | date(format="%B %d, %Y") }} {%- endif %} {#- divider #} {%- if config.extra.meta_index.updated or config.extra.meta_index.categories_tags %} {%- if config.extra.meta_index.divider %}<span class="hpad">{{ config.extra.meta_index.divider | safe }}</span>{%- else %} <span class="rpad"></span> {%- endif %}{%- endif %}{% endif %} @@ -169,14 +155,9 @@ {#- Updated #} {%- if config.extra.meta_index.updated and page.updated %} {%- if config.extra.icon_date %}<i class="{{ config.extra.icon_date }}"></i> {% endif -%} {{ macros::translate(key="Updated", default="Updated", i18n=i18n) }}: - {%- if config.extra.date_locale %} - {%- if lang != config.default_language -%} - {%- set lang_locale = macros::translate(key='date_locale', default='en_US', i18n=i18n) -%} - {%- else -%} - {%- set lang_locale = config.extra.date_locale -%} - {%- endif %} {{ page.updated | date(format="%B %d, %Y", locale=lang_locale) }} - {%- else %} {{ page.updated | date(format="%B %d, %Y") }} {%- endif %} - + {%- set lang_locale = macros::translate(key='date_locale', default='en_US', i18n=i18n) -%} + {%- set page_updated = page.updated | date(format="%B %d, %Y", locale=lang_locale) -%} + {%- if page_updated %} {{ page_updated }} {%- else %} {{ page.updated | date(format="%B %d, %Y") }} {%- endif %} {#- divider #} {%- if config.extra.meta_index.categories_tags %} {%- if config.extra.meta_index.divider %}<span class="hpad">{{ config.extra.meta_index.divider | safe }}</span>{%- else %} <span class="rpad"></span> {%- endif %}{%- endif %}{% endif %} |