Skip to content

Commit

Permalink
Edited Estonian translations
Browse files Browse the repository at this point in the history
  • Loading branch information
@artjom3729
artjom3729 committed Aug 22, 2024
1 parent 8cebb91 commit 5beabcc
Showing 1 changed file with 83 additions and 45 deletions.
128 changes: 83 additions & 45 deletions tex/latex/biblatex-apa/lbx/estonian-apa.lbx
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\ProvidesFile{estonian-apa.lbx}[2024/07/24\space v9.17\space APA biblatex localisation]
\ProvidesFile{estonian-apa.lbx}[2024/08/22\space v9.17\space APA biblatex localisation]
\InheritBibliographyExtras{estonian}

\NewBibliographyString{andothers}
Expand Down Expand Up @@ -69,11 +69,11 @@

\DeclareBibliographyStrings{%
inherit = {estonian},
andothers = {jt\adddot},
andmore = {jt\adddot},
andothers = {{ja teised}{jt\adddot}},
andmore = {{ja teised}{jt\adddot}},
jourarticle = {{artikkel}{artikkel}},
% tothe = {{to\space the}{to\space the}},% doesn't exist in Estonian
% ofthe = {{of\space the}{of\space the}},% doesn't exist in Estonian
tothe = {{}{}},% doesn't exist in Estonian
ofthe = {{}{}},% doesn't exist in Estonian
unitednations = {{Ühinenud\space Rahvaste\space Organisatsioon}{\"{U}RO}},
charter = {{tšarter}{tšarter}},
article = {{artikkel}{art}},
Expand All @@ -84,7 +84,7 @@
map = {{kaart}{kaart}},
photograph = {{pilt}{pilt}},
photographs = {{pildid}{pildid}},
powerpoint = {{Powerpointi\space slaidid}{Powerpointi\space slaidid}},
powerpoint = {{Esitlus}{Esitlus}},
lecturenotes = {{loengu\space m\"{a}rkmed}{loengu\space m\"{a}rkmed}},
podcast = {{taskuhääling}{taskuhääling}},
podcastepisode = {{taskuhäälingu episood}{taskuhäälingu episood}},
Expand Down Expand Up @@ -121,10 +121,10 @@
commenton = {{kommentaar}{kommentaar}},
page = {{Lehekülg}{{}lk}},
pages = {{Leheküljed}{{}lk}},
% on = {{on}{on}},
retrieved = {{saadud}{saadud}},
on = {{}{}},
retrieved = {{vaadatud}{vaadatud}},
available = {{kättesaadav}{kättesaadav}},
% from = {{from}{from}},
from = {{}{}},
archivedat = {{arhiveeritud}{arhiveeritud}},
reprintas = {{kordustrükitud kui}{kordustrükitud kui}},
reprintfrom = {{kordustrükitud}{kordustrükitud}},
Expand All @@ -134,8 +134,8 @@
mathesis = {{Magistritöö}{Magistritöö}},
phdthesis = {{Doktoritöö}{Doktoritöö}},
origyear = {{algupärane\space teos\space avaldatud}{algupärane\space teos\space avaldatud}},
chair = {{Juhatus}{Juhatus}},
chairs = {{Juhatused}{Juhatused}},
chair = {{Esimees}{Esimees}},
chairs = {{Esimehed}{Esimehed}},
typevolume = {{Köide\space toimetaja}{Kd\space toim}},
typevolumes = {{Köide\space toimetajad}{Kd\space toim}},
typeseries = {{Sarja\space toimetaja}{Sr\space toim}},
Expand All @@ -157,7 +157,40 @@
% You must use \print*date to get here otherwise it will be ignored

\DeclareBibliographyExtras{%
\def\urldatecomma{\addcomma\addspace}%
\renewcommand*{\mkdaterangeapalongextra}[1]{%
\begingroup
\blx@metadateinfo{#1}%
\iffieldundef{#1year}{}
{\printtext[#1date]{%
\datecircaprint
\ifboolexpr{ test {\iffieldsequal{#1year}{#1endyear}}
and test {\iffieldsequal{#1month}{#1endmonth}}}
{\iffieldundef{#1endday}
{\mkbibdateapalongextra{#1year}{#1yeardivision}{#1month}{#1day}}
{\mkbibdateapalongextra{#1year}{#1yeardivision}{}{#1day}%
\bibdatedash%
\mkbibdateapalongextra{}{}{#1month}{#1endday}}}%
{\mkbibdateapalongextra{#1year}{#1yeardivision}{#1month}{#1day}}%
\dateeraprint{#1year}%
\dateuncertainprint%
\ifboolexpr{ not test {\iffieldundef{#1endyear}}
and (not test {\iffieldsequal{#1year}{#1endyear}}
or not test {\iffieldsequal{#1month}{#1endmonth}})}
{\bibdatedash
\iffieldequalstr{#1endyear}% open-ended range?
{}
{\bibstring{present}}}
{}%
\iffieldsequal{#1year}{#1endyear}
{\iffieldsequal{#1month}{#1endmonth}
{}
{\mkbibdateapalongextra{}{}{#1endmonth}{#1endday}}}
{\mkbibdateapalongextra{#1endyear}{#1endyeardivision}{#1endmonth}{#1endday}}%
\dateeraprint{#1endyear}%
\enddateuncertainprint}%
\endgroup}}%
\renewcommand{\apashortdash}{~}%
\def\urldatecomma{\addspace}%
\protected\def\mkbibdateapalong#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ (test {\ifentrytype{article}}
Expand All @@ -168,25 +201,25 @@
{}%
\iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}%
{\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
\iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
\iffieldundef{#3}% MONTH
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
\mkbibmonth{\thefield{#3}}}%
\iffieldundef{#4}% DAY
{}%
{\iffieldundef{#3}%
{}%
{\addspace}%
\stripzeros{\thefield{#4}}}}%
{\mkbibordinal{\thefield{#4}}%
\iffieldundef{#3}
{}
{\addspace}}%
\iffieldundef{#3}% MONTH
{}%
{\mkbibmonth{\thefield{#3}}}}%
\protected\def\mkbibdateapalongextra#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ (test {\ifentrytype{article}}
Expand All @@ -197,25 +230,25 @@
{}%
\iffieldundef{#1}% YEAR
{}%
{\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}}%
{\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}\printfield{extradate}%
\ifboolexpr{test {\iffieldundef{#4}} and test {\iffieldundef{#3}}}
{}
{\addcomma\space}}%
\iffieldundef{#2}% YEARDIVISION
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
\iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
\iffieldundef{#3}% MONTH
{}%
{\iffieldundef{#1}%
{}%
{\addcomma\addspace}%
\mkbibmonth{\thefield{#3}}}%
\iffieldundef{#4}% DAY
{}%
{\iffieldundef{#3}%
{}%
{\addspace}%
\stripzeros{\thefield{#4}}}}%
{\mkbibordinal{\thefield{#4}}%
\iffieldundef{#3}
{}
{\addspace}}%
\iffieldundef{#3}% MONTH
{}%
{\mkbibmonth{\thefield{#3}}}}%
\protected\def\mkbibdateapalongmdy#1#2#3#4{%
% As per 10.1, Articles only have year
\ifboolexpr{ (test {\ifentrytype{article}}
Expand All @@ -230,21 +263,26 @@
{}%
{\addcomma\addspace}%
\iffieldbibstring{#2}{\bibcplstring{\thefield{#2}}}{\thefield{#2}}}%
\iffieldundef{#3}% MONTH
{}%
{\mkbibmonth{\thefield{#3}}}%
\iffieldundef{#4}% DAY
{}%
{\addspace}%
\stripzeros{\thefield{#4}}%
\iffieldundef{#1}% YEAR
{\mkbibordinal{\thefield{#4}}}%
\iffieldundef{#3}% MONTH
{}%
{\iffieldundef{#4}%
{\iffieldundef{#3}%
{}%
{\addspace}}%
{\addcomma\addspace}%
\iffieldbibstring{#1}{\bibncpstring{\thefield{#1}}}{\thefield{#1}}}}}
{}%
{\addspace}%
\mkbibmonth{\thefield{#3}}}%
\iffieldundef{#1}% YEAR
{}%
{\iffieldundef{#3}%
{}%
{\addspace}%
\iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\thefield{#1}}}}}

\UndeclareBibliographyExtras{%
\restorecommand\mkdaterangeapalong
\restorecommand\mkdaterangeapalongextra
}

%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Expand Down

0 comments on commit 5beabcc

Please sign in to comment.