Skip to content

Commit

Permalink
[ES] Fix handling of the 'plm' template without arguments (fixes #106)
Browse files Browse the repository at this point in the history
  • Loading branch information
BoboTiG committed Sep 20, 2020
1 parent 7a27075 commit 6c6938c
Show file tree
Hide file tree
Showing 8 changed files with 124 additions and 34 deletions.
42 changes: 21 additions & 21 deletions html/scripts/user_functions.html
Expand Up @@ -3,16 +3,16 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1" />
<meta name="generator" content="pdoc 0.8.4" />
<meta name="generator" content="pdoc 0.9.1" />
<title>scripts.user_functions API documentation</title>
<meta name="description" content="Functions that can be used in *templates_multi* of any locale …" />
<link rel="preload stylesheet" as="style" href="https://cdnjs.cloudflare.com/ajax/libs/10up-sanitize.css/11.0.1/sanitize.min.css" integrity="sha256-PK9q560IAAa6WVRRh76LtCaI8pjTJ2z11v0miyNNjrs=" crossorigin>
<link rel="preload stylesheet" as="style" href="https://cdnjs.cloudflare.com/ajax/libs/10up-sanitize.css/11.0.1/typography.min.css" integrity="sha256-7l/o7C8jubJiy74VsKTidCy1yBkRtiUGbVkYBylBqUg=" crossorigin>
<link rel="stylesheet preload" as="style" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.18.1/styles/github.min.css" crossorigin>
<link rel="stylesheet preload" as="style" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.1/styles/github.min.css" crossorigin>
<style>:root{--highlight-color:#fe9}.flex{display:flex !important}body{line-height:1.5em}#content{padding:20px}#sidebar{padding:30px;overflow:hidden}#sidebar > *:last-child{margin-bottom:2cm}.http-server-breadcrumbs{font-size:130%;margin:0 0 15px 0}#footer{font-size:.75em;padding:5px 30px;border-top:1px solid #ddd;text-align:right}#footer p{margin:0 0 0 1em;display:inline-block}#footer p:last-child{margin-right:30px}h1,h2,h3,h4,h5{font-weight:300}h1{font-size:2.5em;line-height:1.1em}h2{font-size:1.75em;margin:1em 0 .50em 0}h3{font-size:1.4em;margin:25px 0 10px 0}h4{margin:0;font-size:105%}h1:target,h2:target,h3:target,h4:target,h5:target,h6:target{background:var(--highlight-color);padding:.2em 0}a{color:#058;text-decoration:none;transition:color .3s ease-in-out}a:hover{color:#e82}.title code{font-weight:bold}h2[id^="header-"]{margin-top:2em}.ident{color:#900}pre code{background:#f8f8f8;font-size:.8em;line-height:1.4em}code{background:#f2f2f1;padding:1px 4px;overflow-wrap:break-word}h1 code{background:transparent}pre{background:#f8f8f8;border:0;border-top:1px solid #ccc;border-bottom:1px solid #ccc;margin:1em 0;padding:1ex}#http-server-module-list{display:flex;flex-flow:column}#http-server-module-list div{display:flex}#http-server-module-list dt{min-width:10%}#http-server-module-list p{margin-top:0}.toc ul,#index{list-style-type:none;margin:0;padding:0}#index code{background:transparent}#index h3{border-bottom:1px solid #ddd}#index ul{padding:0}#index h4{margin-top:.6em;font-weight:bold}@media (min-width:200ex){#index .two-column{column-count:2}}@media (min-width:300ex){#index .two-column{column-count:3}}dl{margin-bottom:2em}dl dl:last-child{margin-bottom:4em}dd{margin:0 0 1em 3em}#header-classes + dl > dd{margin-bottom:3em}dd dd{margin-left:2em}dd p{margin:10px 0}.name{background:#eee;font-weight:bold;font-size:.85em;padding:5px 10px;display:inline-block;min-width:40%}.name:hover{background:#e0e0e0}dt:target .name{background:var(--highlight-color)}.name > span:first-child{white-space:nowrap}.name.class > span:nth-child(2){margin-left:.4em}.inherited{color:#999;border-left:5px solid #eee;padding-left:1em}.inheritance em{font-style:normal;font-weight:bold}.desc h2{font-weight:400;font-size:1.25em}.desc h3{font-size:1em}.desc dt code{background:inherit}.source summary,.git-link-div{color:#666;text-align:right;font-weight:400;font-size:.8em;text-transform:uppercase}.source summary > *{white-space:nowrap;cursor:pointer}.git-link{color:inherit;margin-left:1em}.source pre{max-height:500px;overflow:auto;margin:0}.source pre code{font-size:12px;overflow:visible}.hlist{list-style:none}.hlist li{display:inline}.hlist li:after{content:',\2002'}.hlist li:last-child:after{content:none}.hlist .hlist{display:inline;padding-left:1em}img{max-width:100%}td{padding:0 .5em}.admonition{padding:.1em .5em;margin-bottom:1em}.admonition-title{font-weight:bold}.admonition.note,.admonition.info,.admonition.important{background:#aef}.admonition.todo,.admonition.versionadded,.admonition.tip,.admonition.hint{background:#dfd}.admonition.warning,.admonition.versionchanged,.admonition.deprecated{background:#fd4}.admonition.error,.admonition.danger,.admonition.caution{background:lightpink}</style>
<style media="screen and (min-width: 700px)">@media screen and (min-width:700px){#sidebar{width:30%;height:100vh;overflow:auto;position:sticky;top:0}#content{width:70%;max-width:100ch;padding:3em 4em;border-left:1px solid #ddd}pre code{font-size:1em}.item .name{font-size:1em}main{display:flex;flex-direction:row-reverse;justify-content:flex-end}.toc ul ul,#index ul{padding-left:1.5em}.toc > ul > li{margin-top:.5em}}</style>
<style media="print">@media print{#sidebar h1{page-break-before:always}.source{display:none}}@media print{*{background:transparent !important;color:#000 !important;box-shadow:none !important;text-shadow:none !important}a[href]:after{content:" (" attr(href) ")";font-size:90%}a[href][title]:after{content:none}abbr[title]:after{content:" (" attr(title) ")"}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100% !important}@page{margin:0.5cm}p,h2,h3{orphans:3;widows:3}h1,h2,h3,h4,h5,h6{page-break-after:avoid}}</style>
<script defer src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.18.1/highlight.min.js" integrity="sha256-eOgo0OtLL4cdq7RdwRUiGKLX9XsIJ7nGhWEKbohmVAQ=" crossorigin></script>
<script defer src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.1/highlight.min.js" integrity="sha256-Uv3H6lx7dJmRfRvH8TH6kJD1TSK1aFcwgx+mdg3epi8=" crossorigin></script>
<script>window.addEventListener('DOMContentLoaded', () => hljs.initHighlighting())</script>
</head>
<body>
Expand Down Expand Up @@ -276,17 +276,17 @@ <h1 class="title">Module <code>scripts.user_functions</code></h1>
return f&#34;({text})&#34;


def person(parts: Tuple[str, ...]) -&gt; str:
def person(word: str, parts: Tuple[str, ...]) -&gt; str:
&#34;&#34;&#34;
Format a person name.

&gt;&gt;&gt; person([&#34;Aldous&#34;, &#34;Huxley&#34;])
&gt;&gt;&gt; person(&#34;foo&#34;, [&#34;Aldous&#34;, &#34;Huxley&#34;])
&#34;Aldous &lt;span style=&#39;font-variant:small-caps&#39;&gt;Huxley&lt;/span&gt;&#34;
&gt;&gt;&gt; person([&#34;Théodore Agrippa d’&#34;, &#34;Aubigné&#34;])
&gt;&gt;&gt; person(&#34;foo&#34;, [&#34;Théodore Agrippa d’&#34;, &#34;Aubigné&#34;])
&#34;Théodore Agrippa d’ &lt;span style=&#39;font-variant:small-caps&#39;&gt;Aubigné&lt;/span&gt;&#34;
&gt;&gt;&gt; person([&#34;Théodore Agrippa d’&#34;, &#34;Aubigné&#34;, &#34;&#39;=oui&#34;])
&gt;&gt;&gt; person(&#34;foo&#34;, [&#34;Théodore Agrippa d’&#34;, &#34;Aubigné&#34;, &#34;&#39;=oui&#34;])
&#34;Théodore Agrippa d’&lt;span style=&#39;font-variant:small-caps&#39;&gt;Aubigné&lt;/span&gt;&#34;
&gt;&gt;&gt; person([&#34;L. L. Zamenhof&#34;])
&gt;&gt;&gt; person(&#34;foo&#34;, [&#34;L. L. Zamenhof&#34;])
&#39;L. L. Zamenhof&#39;

Source: https://fr.wiktionary.org/wiki/Mod%C3%A8le:nom_w_pc
Expand All @@ -297,7 +297,7 @@ <h1 class="title">Module <code>scripts.user_functions</code></h1>
res += &#34; &#34;
res += small_caps(parts[1])
else:
warn(f&#34;Malformed template in the Wikicode (parts={parts})&#34;)
warn(f&#34;Malformed template in the Wikicode of {word!r} (parts={parts})&#34;)
return res


Expand Down Expand Up @@ -904,35 +904,35 @@ <h2 class="section-title" id="header-functions">Functions</h2>
</details>
</dd>
<dt id="scripts.user_functions.person"><code class="name flex">
<span>def <span class="ident">person</span></span>(<span>parts: Tuple[str, ...]) ‑> str</span>
<span>def <span class="ident">person</span></span>(<span>word: str, parts: Tuple[str, ...]) ‑> str</span>
</code></dt>
<dd>
<div class="desc"><p>Format a person name.</p>
<pre><code>&gt;&gt;&gt; person(["Aldous", "Huxley"])
<pre><code>&gt;&gt;&gt; person("foo", ["Aldous", "Huxley"])
"Aldous &lt;span style='font-variant:small-caps'&gt;Huxley&lt;/span&gt;"
&gt;&gt;&gt; person(["Théodore Agrippa d’", "Aubigné"])
&gt;&gt;&gt; person("foo", ["Théodore Agrippa d’", "Aubigné"])
"Théodore Agrippa d’ &lt;span style='font-variant:small-caps'&gt;Aubigné&lt;/span&gt;"
&gt;&gt;&gt; person(["Théodore Agrippa d’", "Aubigné", "'=oui"])
&gt;&gt;&gt; person("foo", ["Théodore Agrippa d’", "Aubigné", "'=oui"])
"Théodore Agrippa d’&lt;span style='font-variant:small-caps'&gt;Aubigné&lt;/span&gt;"
&gt;&gt;&gt; person(["L. L. Zamenhof"])
&gt;&gt;&gt; person("foo", ["L. L. Zamenhof"])
'L. L. Zamenhof'
</code></pre>
<p>Source: <a href="https://fr.wiktionary.org/wiki/Mod%C3%A8le:nom_w_pc">https://fr.wiktionary.org/wiki/Mod%C3%A8le:nom_w_pc</a></p></div>
<details class="source">
<summary>
<span>Expand source code</span>
</summary>
<pre><code class="python">def person(parts: Tuple[str, ...]) -&gt; str:
<pre><code class="python">def person(word: str, parts: Tuple[str, ...]) -&gt; str:
&#34;&#34;&#34;
Format a person name.

&gt;&gt;&gt; person([&#34;Aldous&#34;, &#34;Huxley&#34;])
&gt;&gt;&gt; person(&#34;foo&#34;, [&#34;Aldous&#34;, &#34;Huxley&#34;])
&#34;Aldous &lt;span style=&#39;font-variant:small-caps&#39;&gt;Huxley&lt;/span&gt;&#34;
&gt;&gt;&gt; person([&#34;Théodore Agrippa d’&#34;, &#34;Aubigné&#34;])
&gt;&gt;&gt; person(&#34;foo&#34;, [&#34;Théodore Agrippa d’&#34;, &#34;Aubigné&#34;])
&#34;Théodore Agrippa d’ &lt;span style=&#39;font-variant:small-caps&#39;&gt;Aubigné&lt;/span&gt;&#34;
&gt;&gt;&gt; person([&#34;Théodore Agrippa d’&#34;, &#34;Aubigné&#34;, &#34;&#39;=oui&#34;])
&gt;&gt;&gt; person(&#34;foo&#34;, [&#34;Théodore Agrippa d’&#34;, &#34;Aubigné&#34;, &#34;&#39;=oui&#34;])
&#34;Théodore Agrippa d’&lt;span style=&#39;font-variant:small-caps&#39;&gt;Aubigné&lt;/span&gt;&#34;
&gt;&gt;&gt; person([&#34;L. L. Zamenhof&#34;])
&gt;&gt;&gt; person(&#34;foo&#34;, [&#34;L. L. Zamenhof&#34;])
&#39;L. L. Zamenhof&#39;

Source: https://fr.wiktionary.org/wiki/Mod%C3%A8le:nom_w_pc
Expand All @@ -943,7 +943,7 @@ <h2 class="section-title" id="header-functions">Functions</h2>
res += &#34; &#34;
res += small_caps(parts[1])
else:
warn(f&#34;Malformed template in the Wikicode (parts={parts})&#34;)
warn(f&#34;Malformed template in the Wikicode of {word!r} (parts={parts})&#34;)
return res</code></pre>
</details>
</dd>
Expand Down Expand Up @@ -1241,7 +1241,7 @@ <h1>Index</h1>
</nav>
</main>
<footer id="footer">
<p>Generated by <a href="https://pdoc3.github.io/pdoc"><cite>pdoc</cite> 0.8.4</a>.</p>
<p>Generated by <a href="https://pdoc3.github.io/pdoc"><cite>pdoc</cite> 0.9.1</a>.</p>
</footer>
</body>
</html>
1 change: 1 addition & 0 deletions requirements.txt
@@ -1,4 +1,5 @@
setuptools>=36.2.1
cachetools==4.1.1
marisa_trie==0.7.5
requests==2.24.0
wikitextparser==0.45.0
3 changes: 2 additions & 1 deletion scripts/lang/es.py
Expand Up @@ -200,8 +200,9 @@
"l+": "italic(parts[-1])",
# {{nombre científico}}
"nombre científico": "superscript(tpl)",
# {{plm}}
# {{plm|cansado}}
"plm": "capitalize(parts[1])",
"plm": "capitalize(parts[1] if len(parts) > 1 else word)",
# {{redirección suave|protocelta}}
"redirección suave": "f\"{italic('Véase')} {parts[1]}\"",
# {{-sub|4}}
Expand Down
2 changes: 1 addition & 1 deletion scripts/lang/fr/__init__.py
Expand Up @@ -548,7 +548,7 @@
# {{nobr|1 000 000 000 000}}
"nobr": "re.sub(r'^1=', '', parts[-1].replace(' ', '&nbsp;').replace('!', '|'))",
# {{nom w pc|Aldous|Huxley}}
"nom w pc": "person(parts[1:])",
"nom w pc": "person(word, parts[1:])",
# {{nombre romain|12}}
"nombre romain": "int_to_roman(int(parts[1]))",
# {{petites capitales|Dupont}}
Expand Down
12 changes: 6 additions & 6 deletions scripts/user_functions.py
Expand Up @@ -246,17 +246,17 @@ def parenthesis(text: str) -> str:
return f"({text})"


def person(parts: Tuple[str, ...]) -> str:
def person(word: str, parts: Tuple[str, ...]) -> str:
"""
Format a person name.
>>> person(["Aldous", "Huxley"])
>>> person("foo", ["Aldous", "Huxley"])
"Aldous <span style='font-variant:small-caps'>Huxley</span>"
>>> person(["Théodore Agrippa d’", "Aubigné"])
>>> person("foo", ["Théodore Agrippa d’", "Aubigné"])
"Théodore Agrippa d’ <span style='font-variant:small-caps'>Aubigné</span>"
>>> person(["Théodore Agrippa d’", "Aubigné", "'=oui"])
>>> person("foo", ["Théodore Agrippa d’", "Aubigné", "'=oui"])
"Théodore Agrippa d’<span style='font-variant:small-caps'>Aubigné</span>"
>>> person(["L. L. Zamenhof"])
>>> person("foo", ["L. L. Zamenhof"])
'L. L. Zamenhof'
Source: https://fr.wiktionary.org/wiki/Mod%C3%A8le:nom_w_pc
Expand All @@ -267,7 +267,7 @@ def person(parts: Tuple[str, ...]) -> str:
res += " "
res += small_caps(parts[1])
else:
warn(f"Malformed template in the Wikicode (parts={parts})")
warn(f"Malformed template in the Wikicode of {word!r} (parts={parts})")
return res


Expand Down
12 changes: 7 additions & 5 deletions scripts/utils.py
Expand Up @@ -2,11 +2,12 @@
import re
from contextlib import suppress
from datetime import datetime
from functools import lru_cache
from pathlib import Path
from typing import Tuple
from warnings import warn

from cachetools import cached
from cachetools.keys import hashkey
import regex

from .constants import DOWNLOAD_URL
Expand Down Expand Up @@ -340,12 +341,13 @@ def transform(word: str, template: str, locale: str) -> str:

# Convert *parts* from a list to a tuple because list are not hashable and thus cannot be used
# with the LRU cache.
return transform_apply(tpl, tuple(parts), locale)
result: str = transform_apply(word, tpl, tuple(parts), locale)
return result


@lru_cache(maxsize=None)
def transform_apply(tpl: str, parts: Tuple[str, ...], locale: str) -> str:
"""Convert the data from the *tpl* template."""
@cached(cache={}, key=lambda word, tpl, parts, locale: hashkey(tpl, parts, locale)) # type: ignore
def transform_apply(word: str, tpl: str, parts: Tuple[str, ...], locale: str) -> str:
"""Convert the data from the *tpl* template of the *word* using the *locale*."""
if tpl in templates_ignored[locale]:
return ""

Expand Down
73 changes: 73 additions & 0 deletions tests/data/es/hocico.wiki
@@ -0,0 +1,73 @@
== {{lengua|es}} ==
{{pron-graf}}

=== Etimología ===
{{etimología2|de [[hocicar]]}}

=== {{sustantivo masculino|es}} ===
{{inflect.es.sust.reg}}

;1 {{zootomía}}: Parte más o menos [[prolongar|prolongada]] de la [[cabeza]] de algunos [[animal]]es en que están la [[boca]] y las [[nariz|narices]].
;2 {{anatomía}}: {{plm}} de una persona cuando tiene muy [[abultado]]s los [[labio]]s.
;3: {{plm|cara}}.
{{uso|familiar}}.
:*'''Ejemplo''' Félix tiene buen ''hocico''.
;4: {{plm|gesto}} que [[denotar|denota]] [[enojo]] o [[enfado]].
;5: Forma despectiva para referirse a la boca de alguien.
{{ámbito|Chile}}.
{{uso|despectivo|malsonante}}
:*'''Ejemplo 1:''' Te voy a dar un [[combo]] en l'''hocico''.
:*'''Ejemplo 2:''' Tení' el ''hocico'' [[hediondo]].
:*'''Ejemplo 3:''' Tengo el ''hocico'' p'a la cag'á.
:*'''Ejemplo 4:''' ¿Querí que te de una patá en el ''hocico''?
;6: Boca de una persona, especialmente de la que dice malas palabras
{{uso|coloquial}}.
{{ámbito|México}}.
{{clear}}
=== Locuciones ===
{{rel-arriba|Locuciones con «hocico»}}
* [[pimiento de hocico]]: Variedad del [[pimiento]], que se diferencia en ser más grueso que el de otras castas.
* [[caer de hocicos]]: Dar con la cara, o cayendo en ella en otra parte.
* [[de hocicos]]: De bruces, cabeza abajo.
* echar, decir o restregar una cosa por los hocicos: Decirle a uno a la cara lo que le repugna oir.
{{rel-centro}}
* [[meter el hocico en todo]]: Ser entrometido.
* [[meter el hocico]] en algo: Entrometerse en algo.
* [[quitar a uno el hocico]]: Ponerle de buen humor.
{{rel-abajo}}
=== Información adicional ===
{{derivad|hocicón|hocicudo|hocico|hocicar}}
=== Véase también ===
{{Wikipedia}}
* [[morro]]
* [[malhablado]]
{{clear}}
=== Traducciones ===
{{trad-arriba}}
{{t+|de|Schnauze}}
{{t+|ca|morro}}
{{t+|fr|museau}}
{{t+|eo|muzelo}}
{{t+|cy|1|trwyn}}
{{t+|en|snout}}
{{trad-centro}}
{{t+|nv|1|áchį́į́h}}
{{t+|nl|snuit}}
{{t+|pt|focinho}}
{{t+|sv|nos}}
{{trad-abajo}}
== Referencias y notas ==
<references />
13 changes: 13 additions & 0 deletions tests/test_es.py
Expand Up @@ -91,6 +91,19 @@
"<i>Grafía obsoleta de</i> asta.",
],
),
(
"hocico",
"",
"",
[
"<i>(Zootomía)</i>: Parte más o menos prolongada de la cabeza de algunos animales en que están la boca y las narices.", # noqa
"<i>(Anatomía)</i>: Hocico de una persona cuando tiene muy abultados los labios.",
"Cara.",
"Gesto que denota enojo o enfado.",
"Forma despectiva para referirse a la boca de alguien.",
"Boca de una persona, especialmente de la que dice malas palabras",
],
),
(
"los",
"",
Expand Down

0 comments on commit 6c6938c

Please sign in to comment.