From 44f49de3bc488426b233bff80f470a76f08423d2 Mon Sep 17 00:00:00 2001 From: Anne Schuth Date: Tue, 15 Oct 2024 08:28:30 +0200 Subject: [PATCH] Fix copy project details --- amt/locale/base.pot | 54 +++++----------- amt/locale/en_US/LC_MESSAGES/messages.mo | Bin 451 -> 451 bytes amt/locale/en_US/LC_MESSAGES/messages.po | 58 +++++------------ amt/locale/nl_NL/LC_MESSAGES/messages.mo | Bin 7179 -> 6856 bytes amt/locale/nl_NL/LC_MESSAGES/messages.po | 60 +++++------------- .../templates/projects/details_base.html.j2 | 2 +- .../templates/projects/details_data.html.j2 | 5 +- .../templates/projects/details_info.html.j2 | 3 - .../projects/details_instruments.html.j2 | 5 +- .../projects/details_requirements.html.j2 | 3 - 10 files changed, 51 insertions(+), 139 deletions(-) diff --git a/amt/locale/base.pot b/amt/locale/base.pot index a7e53ed3c..90bb8428e 100644 --- a/amt/locale/base.pot +++ b/amt/locale/base.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-10-14 12:11+0200\n" +"POT-Creation-Date: 2024-10-15 08:26+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -205,12 +205,16 @@ msgstr "" msgid "Email" msgstr "" -#: amt/site/templates/auth/profile.html.j2:40 +#: amt/site/templates/auth/profile.html.j2:49 #: amt/site/templates/parts/header.html.j2:92 #: amt/site/templates/parts/header.html.j2:151 msgid "Language" msgstr "" +#: amt/site/templates/auth/profile.html.j2:54 +msgid "Select language" +msgstr "" + #: amt/site/templates/errors/AMTAuthorizationError_401.html.j2:5 msgid "Not logged in" msgstr "" @@ -220,7 +224,7 @@ msgid "Please login to view this page" msgstr "" #: amt/site/templates/errors/AMTAuthorizationError_401.html.j2:11 -#: amt/site/templates/pages/landingpage.html.j2:16 +#: amt/site/templates/pages/landingpage.html.j2:17 #: amt/site/templates/parts/header.html.j2:103 #: amt/site/templates/parts/header.html.j2:161 msgid "Login" @@ -251,10 +255,6 @@ msgid "Reviewing" msgstr "" #: amt/site/templates/macros/tasks.html.j2:32 -#: amt/site/templates/projects/details_base.html.j2:22 -#: amt/site/templates/projects/details_base.html.j2:43 -#: amt/site/templates/projects/details_base.html.j2:69 -#: amt/site/templates/projects/details_base.html.j2:91 msgid "Done" msgstr "" @@ -265,7 +265,7 @@ msgstr "" #: amt/site/templates/pages/assessment_card.html.j2:7 #: amt/site/templates/pages/model_card.html.j2:6 #: amt/site/templates/pages/system_card.html.j2:4 -#: amt/site/templates/projects/details_info.html.j2:35 +#: amt/site/templates/projects/details_info.html.j2:32 msgid "Last updated" msgstr "" @@ -333,56 +333,32 @@ msgstr "" msgid "Everyone is welcome to make comments and suggestions." msgstr "" -#: amt/site/templates/projects/details_base.html.j2:3 #: amt/site/templates/projects/details_data.html.j2:3 -#: amt/site/templates/projects/details_info.html.j2:3 #: amt/site/templates/projects/details_instruments.html.j2:3 -#: amt/site/templates/projects/details_requirements.html.j2:3 -msgid "AMT Placeholder information page" -msgstr "" - -#: amt/site/templates/projects/details_base.html.j2:20 -msgid "Does the algorithm meet the requirements?" -msgstr "" - -#: amt/site/templates/projects/details_base.html.j2:41 -#: amt/site/templates/projects/details_base.html.j2:89 -msgid "To do" -msgstr "" - -#: amt/site/templates/projects/details_base.html.j2:55 -msgid "Go to all requirements" -msgstr "" - -#: amt/site/templates/projects/details_base.html.j2:66 -msgid "Which instruments are executed?" -msgstr "" - -#: amt/site/templates/projects/details_base.html.j2:103 -msgid "Go to all instruments" +msgid "To be implemented" msgstr "" -#: amt/site/templates/projects/details_info.html.j2:10 +#: amt/site/templates/projects/details_info.html.j2:7 msgid "Description" msgstr "" -#: amt/site/templates/projects/details_info.html.j2:14 +#: amt/site/templates/projects/details_info.html.j2:11 msgid "Repository" msgstr "" -#: amt/site/templates/projects/details_info.html.j2:20 +#: amt/site/templates/projects/details_info.html.j2:17 msgid "Project code" msgstr "" -#: amt/site/templates/projects/details_info.html.j2:24 +#: amt/site/templates/projects/details_info.html.j2:21 msgid "Lifecyle" msgstr "" -#: amt/site/templates/projects/details_info.html.j2:39 +#: amt/site/templates/projects/details_info.html.j2:36 msgid "Labels" msgstr "" -#: amt/site/templates/projects/details_requirements.html.j2:22 +#: amt/site/templates/projects/details_requirements.html.j2:19 msgid "measures executed" msgstr "" diff --git a/amt/locale/en_US/LC_MESSAGES/messages.mo b/amt/locale/en_US/LC_MESSAGES/messages.mo index 0e5d05bbf1389627fe3d43ba2bcec674dc7baf72..6942cdaf77169b98113b6401810cb9eb57e7fa6f 100644 GIT binary patch delta 18 ZcmX@ie3*H{M0QgJ0}Cr7vyC&f838$y1&IIv delta 18 ZcmX@ie3*H{M0OJeLnA9g!;Lev838#$1$_Vj diff --git a/amt/locale/en_US/LC_MESSAGES/messages.po b/amt/locale/en_US/LC_MESSAGES/messages.po index 28eeecf33..1a6987001 100644 --- a/amt/locale/en_US/LC_MESSAGES/messages.po +++ b/amt/locale/en_US/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-10-14 12:11+0200\n" +"POT-Creation-Date: 2024-10-15 08:26+0200\n" "PO-Revision-Date: 2024-07-25 21:01+0200\n" "Last-Translator: FULL NAME \n" "Language: en_US\n" @@ -206,12 +206,16 @@ msgstr "" msgid "Email" msgstr "" -#: amt/site/templates/auth/profile.html.j2:40 +#: amt/site/templates/auth/profile.html.j2:49 #: amt/site/templates/parts/header.html.j2:92 #: amt/site/templates/parts/header.html.j2:151 msgid "Language" msgstr "" +#: amt/site/templates/auth/profile.html.j2:54 +msgid "Select language" +msgstr "" + #: amt/site/templates/errors/AMTAuthorizationError_401.html.j2:5 msgid "Not logged in" msgstr "" @@ -221,7 +225,7 @@ msgid "Please login to view this page" msgstr "" #: amt/site/templates/errors/AMTAuthorizationError_401.html.j2:11 -#: amt/site/templates/pages/landingpage.html.j2:16 +#: amt/site/templates/pages/landingpage.html.j2:17 #: amt/site/templates/parts/header.html.j2:103 #: amt/site/templates/parts/header.html.j2:161 msgid "Login" @@ -252,10 +256,6 @@ msgid "Reviewing" msgstr "" #: amt/site/templates/macros/tasks.html.j2:32 -#: amt/site/templates/projects/details_base.html.j2:22 -#: amt/site/templates/projects/details_base.html.j2:43 -#: amt/site/templates/projects/details_base.html.j2:69 -#: amt/site/templates/projects/details_base.html.j2:91 msgid "Done" msgstr "" @@ -266,7 +266,7 @@ msgstr "" #: amt/site/templates/pages/assessment_card.html.j2:7 #: amt/site/templates/pages/model_card.html.j2:6 #: amt/site/templates/pages/system_card.html.j2:4 -#: amt/site/templates/projects/details_info.html.j2:35 +#: amt/site/templates/projects/details_info.html.j2:32 msgid "Last updated" msgstr "" @@ -334,56 +334,32 @@ msgstr "" msgid "Everyone is welcome to make comments and suggestions." msgstr "" -#: amt/site/templates/projects/details_base.html.j2:3 #: amt/site/templates/projects/details_data.html.j2:3 -#: amt/site/templates/projects/details_info.html.j2:3 #: amt/site/templates/projects/details_instruments.html.j2:3 -#: amt/site/templates/projects/details_requirements.html.j2:3 -msgid "AMT Placeholder information page" -msgstr "" - -#: amt/site/templates/projects/details_base.html.j2:20 -msgid "Does the algorithm meet the requirements?" -msgstr "" - -#: amt/site/templates/projects/details_base.html.j2:41 -#: amt/site/templates/projects/details_base.html.j2:89 -msgid "To do" -msgstr "" - -#: amt/site/templates/projects/details_base.html.j2:55 -msgid "Go to all requirements" -msgstr "" - -#: amt/site/templates/projects/details_base.html.j2:66 -msgid "Which instruments are executed?" +msgid "To be implemented" msgstr "" -#: amt/site/templates/projects/details_base.html.j2:103 -msgid "Go to all instruments" -msgstr "" - -#: amt/site/templates/projects/details_info.html.j2:10 +#: amt/site/templates/projects/details_info.html.j2:7 msgid "Description" msgstr "" -#: amt/site/templates/projects/details_info.html.j2:14 +#: amt/site/templates/projects/details_info.html.j2:11 msgid "Repository" msgstr "" -#: amt/site/templates/projects/details_info.html.j2:20 +#: amt/site/templates/projects/details_info.html.j2:17 msgid "Project code" msgstr "" -#: amt/site/templates/projects/details_info.html.j2:24 +#: amt/site/templates/projects/details_info.html.j2:21 msgid "Lifecyle" msgstr "" -#: amt/site/templates/projects/details_info.html.j2:39 +#: amt/site/templates/projects/details_info.html.j2:36 msgid "Labels" msgstr "" -#: amt/site/templates/projects/details_requirements.html.j2:22 +#: amt/site/templates/projects/details_requirements.html.j2:19 msgid "measures executed" msgstr "" @@ -465,7 +441,3 @@ msgstr "" #: amt/site/templates/projects/new.html.j2:191 msgid "Copy results and close" msgstr "" - -#~ msgid "Algortime Management Toolkit" -#~ msgstr "" - diff --git a/amt/locale/nl_NL/LC_MESSAGES/messages.mo b/amt/locale/nl_NL/LC_MESSAGES/messages.mo index 0a0aa83739be4163820787290e7d3f099469646c..12d7ee148816c2b15d2732f81501c8e7da502d4a 100644 GIT binary patch delta 1728 zcmYk+Z%oZm9LMp~O{MEz{h^yguF4D-t##E}$TDjeEew&B%vDml?D{)%dEnnLYuBGA zGG;d&4`4n0Z|KA71Y@RQ zJ60JJGJQ1o%uFL{66RqdmZAfFn2M`03mcIs<`}xL6_wyM9E*2x1U^GIzQ9rV6}8SV zYJMDxjADJ`q!GtJ25RCYv}3L{J{!ICy_knvP>G($ad-n~;A7PMFQ|lmTKzbJDFHi9 zLKkM>9L!;TQ%OUCf~X8nB1xLls0y?pu}p_GejAl=7wY+LtN#?aOdmHb@CKF857e#> zp%NKJ8`|lFoHU#?+?a{VumqLBI^2hT0!*rv$z*1SY*{f7{Z8X8R;aUHT=%NV{}3Rs9dVoFgZTaK#8I#dD; zs02c&1TUkuuoEes=|w#kMOEZ8y79a9c_@vIQs8V<01s+`0?SfVB1@3VtmLLrHlhau zSd48*QA`xI;2;*@FVyn|X`B}J5KcI#^YSX5gO}LM`k;y-+@qi XW=pMTsdoqepT0djFLP74C$sD~Ugogg delta 2016 zcmY+^Z*0>=9LMon9W7;(@@KPkZ0^Ela5|M$CT=k-{>$c=2D1sosH3vmTJ0a{TB37H z6VXV7Xt3D>H9Wu|s1r47VvtBeNJua&5+fL=MuYl5e6S!2#+Vr2pYe;EOWW7)?tXXo zz3<)aWb3Xw3g0g)A2<9B@~!3DbCpVSf1`e57E>I<2HcGnKf;Ch1un;LQ2l3cDOLoG zX~a5I`EDG-KJ3O%vB{W%2{6iLDq4`f=4A}w9t`3>ti%aihKKPwJcW#5e#L9>A}Y`z zovJW`<#;n%jA8}$qUPzx0P~wcuOW?1G>qT^+>aXIJzRtzdi6)JmGUuMjh9gYui~W$ zuEm>h16JcGD!|uJdvveG>VYkNNT8al9H&pv5my0sesspo-Z? zu@0#+Z=km304~83$j5x;`4g(&1=JS(RZ0F;v6xvDSs2w}C2B>tq5^EgD6YfxxD7So zQPfI5!-g_rPGdji-^uTT*vr1C{Vmiu?|2?Uot?=L`PU0asHnkXxB|aLt@KY+X2L8- zd$+QK>qO z7SDL?mrw)yIMN!R5;Z{;Hlg*(-Kc;zB3(>BD#JN!#u04CgGh1<=0_eh@kLyNK?+*= zI#m5;el$P^*Vs=vh<%uXyc6RA8^8&c;EnJb|}R{sb-lf*Lo-U499d<09?tn>;A; z14v5D6e`8vp;q`as^f2{f3<(30t=BQ-I{7tyYv5 zC$`4t_q4IBv+fzUHJ@_>9mPjN`vPlhOSHYErQ};OSXS)uH1@j z1)3t{SX!|-yWM47VmRm09mS5SORGC$HXVy)ue8kt>eA+aE&uf@-Bx|pR|-cimo4aX lmSF2^1{*fHKXWK9L)8+cPdpz%SI?`!9SV3OE1& diff --git a/amt/locale/nl_NL/LC_MESSAGES/messages.po b/amt/locale/nl_NL/LC_MESSAGES/messages.po index 478965fe7..6e5b2b035 100644 --- a/amt/locale/nl_NL/LC_MESSAGES/messages.po +++ b/amt/locale/nl_NL/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-10-14 12:11+0200\n" +"POT-Creation-Date: 2024-10-15 08:26+0200\n" "PO-Revision-Date: 2024-07-25 21:01+0200\n" "Last-Translator: FULL NAME \n" "Language: nl_NL\n" @@ -214,12 +214,16 @@ msgstr "Naam" msgid "Email" msgstr "Email" -#: amt/site/templates/auth/profile.html.j2:40 +#: amt/site/templates/auth/profile.html.j2:49 #: amt/site/templates/parts/header.html.j2:92 #: amt/site/templates/parts/header.html.j2:151 msgid "Language" msgstr "Taal" +#: amt/site/templates/auth/profile.html.j2:54 +msgid "Select language" +msgstr "Selecteer taal" + #: amt/site/templates/errors/AMTAuthorizationError_401.html.j2:5 msgid "Not logged in" msgstr "Niet ingelogd" @@ -229,7 +233,7 @@ msgid "Please login to view this page" msgstr "Meld u aan om deze pagina te bekijken" #: amt/site/templates/errors/AMTAuthorizationError_401.html.j2:11 -#: amt/site/templates/pages/landingpage.html.j2:16 +#: amt/site/templates/pages/landingpage.html.j2:17 #: amt/site/templates/parts/header.html.j2:103 #: amt/site/templates/parts/header.html.j2:161 msgid "Login" @@ -260,10 +264,6 @@ msgid "Reviewing" msgstr "Beoordelen" #: amt/site/templates/macros/tasks.html.j2:32 -#: amt/site/templates/projects/details_base.html.j2:22 -#: amt/site/templates/projects/details_base.html.j2:43 -#: amt/site/templates/projects/details_base.html.j2:69 -#: amt/site/templates/projects/details_base.html.j2:91 msgid "Done" msgstr "Afgerond" @@ -274,7 +274,7 @@ msgstr "Onbekend" #: amt/site/templates/pages/assessment_card.html.j2:7 #: amt/site/templates/pages/model_card.html.j2:6 #: amt/site/templates/pages/system_card.html.j2:4 -#: amt/site/templates/projects/details_info.html.j2:35 +#: amt/site/templates/projects/details_info.html.j2:32 msgid "Last updated" msgstr "Laatst bijgewerkt" @@ -342,56 +342,32 @@ msgstr "Deze website is in ontwikkeling. Alle versies ontstaan op een open manie msgid "Everyone is welcome to make comments and suggestions." msgstr "Iedereen mag opmerkingen en suggesties doen." -#: amt/site/templates/projects/details_base.html.j2:3 #: amt/site/templates/projects/details_data.html.j2:3 -#: amt/site/templates/projects/details_info.html.j2:3 #: amt/site/templates/projects/details_instruments.html.j2:3 -#: amt/site/templates/projects/details_requirements.html.j2:3 -msgid "AMT Placeholder information page" -msgstr "AMT Placeholder informatie pagina's" - -#: amt/site/templates/projects/details_base.html.j2:20 -msgid "Does the algorithm meet the requirements?" -msgstr "Voldoet het algoritme aan alle vereisten?" - -#: amt/site/templates/projects/details_base.html.j2:41 -#: amt/site/templates/projects/details_base.html.j2:89 -msgid "To do" -msgstr "Te doen" +msgid "To be implemented" +msgstr "Nog te implementeren" -#: amt/site/templates/projects/details_base.html.j2:55 -msgid "Go to all requirements" -msgstr "Ga naar alle vereisten" - -#: amt/site/templates/projects/details_base.html.j2:66 -msgid "Which instruments are executed?" -msgstr "Welke instrumenten zijn uitgevoerd?" - -#: amt/site/templates/projects/details_base.html.j2:103 -msgid "Go to all instruments" -msgstr "Ga naar alle instrumenten" - -#: amt/site/templates/projects/details_info.html.j2:10 +#: amt/site/templates/projects/details_info.html.j2:7 msgid "Description" msgstr "Omschrijving" -#: amt/site/templates/projects/details_info.html.j2:14 +#: amt/site/templates/projects/details_info.html.j2:11 msgid "Repository" msgstr "Repository" -#: amt/site/templates/projects/details_info.html.j2:20 +#: amt/site/templates/projects/details_info.html.j2:17 msgid "Project code" msgstr "Project" -#: amt/site/templates/projects/details_info.html.j2:24 +#: amt/site/templates/projects/details_info.html.j2:21 msgid "Lifecyle" msgstr "Levenscyclus" -#: amt/site/templates/projects/details_info.html.j2:39 +#: amt/site/templates/projects/details_info.html.j2:36 msgid "Labels" msgstr "Labels" -#: amt/site/templates/projects/details_requirements.html.j2:22 +#: amt/site/templates/projects/details_requirements.html.j2:19 msgid "measures executed" msgstr "maatregelen uitgevoerd" @@ -478,7 +454,3 @@ msgstr "Maak project" #: amt/site/templates/projects/new.html.j2:191 msgid "Copy results and close" msgstr "Resultaten overnemen en sluiten" - -#~ msgid "Algortime Management Toolkit" -#~ msgstr "Algoritme Management Toolkit" - diff --git a/amt/site/templates/projects/details_base.html.j2 b/amt/site/templates/projects/details_base.html.j2 index eec4d3a7c..66c3296ef 100644 --- a/amt/site/templates/projects/details_base.html.j2 +++ b/amt/site/templates/projects/details_base.html.j2 @@ -1,6 +1,6 @@ {% extends 'layouts/base.html.j2' %} {% block title %} - {% trans %}AMT Placeholder information page{% endtrans %} + {% trans %}{{ project.name }} | {% endtrans %} {% endblock %} {% block content %}
diff --git a/amt/site/templates/projects/details_data.html.j2 b/amt/site/templates/projects/details_data.html.j2 index b505f2f2a..22c9ad136 100644 --- a/amt/site/templates/projects/details_data.html.j2 +++ b/amt/site/templates/projects/details_data.html.j2 @@ -1,5 +1,4 @@ {% extends 'projects/details_base.html.j2' %} -{% block title %} - {% trans %}AMT Placeholder information page{% endtrans %} +{% block detail_content %} +
{% trans %}To be implemented{% endtrans %}
{% endblock %} -{% block detail_content %}
To be implemented
{% endblock %} diff --git a/amt/site/templates/projects/details_info.html.j2 b/amt/site/templates/projects/details_info.html.j2 index 52eb926d0..d74057bff 100644 --- a/amt/site/templates/projects/details_info.html.j2 +++ b/amt/site/templates/projects/details_info.html.j2 @@ -1,7 +1,4 @@ {% extends 'projects/details_base.html.j2' %} -{% block title %} - {% trans %}AMT Placeholder information page{% endtrans %} -{% endblock %} {% block detail_content %}
diff --git a/amt/site/templates/projects/details_instruments.html.j2 b/amt/site/templates/projects/details_instruments.html.j2 index b505f2f2a..22c9ad136 100644 --- a/amt/site/templates/projects/details_instruments.html.j2 +++ b/amt/site/templates/projects/details_instruments.html.j2 @@ -1,5 +1,4 @@ {% extends 'projects/details_base.html.j2' %} -{% block title %} - {% trans %}AMT Placeholder information page{% endtrans %} +{% block detail_content %} +
{% trans %}To be implemented{% endtrans %}
{% endblock %} -{% block detail_content %}
To be implemented
{% endblock %} diff --git a/amt/site/templates/projects/details_requirements.html.j2 b/amt/site/templates/projects/details_requirements.html.j2 index 1d77c09e1..28bfdc0ac 100644 --- a/amt/site/templates/projects/details_requirements.html.j2 +++ b/amt/site/templates/projects/details_requirements.html.j2 @@ -1,7 +1,4 @@ {% extends 'projects/details_base.html.j2' %} -{% block title %} - {% trans %}AMT Placeholder information page{% endtrans %} -{% endblock %} {% block detail_content %}
{% for (requirement, measures) in requirements_and_measures %}