From 2c4e494e6e87ac3f4aac5a64adc479b135625bf5 Mon Sep 17 00:00:00 2001 From: Anne Schuth Date: Sat, 19 Oct 2024 18:51:10 +0200 Subject: [PATCH] Rename phase to lifecycle --- amt/locale/base.pot | 9 +++------ amt/locale/en_US/LC_MESSAGES/messages.mo | Bin 451 -> 451 bytes amt/locale/en_US/LC_MESSAGES/messages.po | 15 +++++++++------ amt/locale/nl_NL/LC_MESSAGES/messages.mo | Bin 10830 -> 10765 bytes amt/locale/nl_NL/LC_MESSAGES/messages.po | 17 ++++------------- amt/repositories/projects.py | 12 ++++++------ amt/site/templates/parts/filter_list.html.j2 | 4 ++-- 7 files changed, 24 insertions(+), 33 deletions(-) diff --git a/amt/locale/base.pot b/amt/locale/base.pot index f025a5a4..1841aea2 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-17 13:18+0000\n" +"POT-Creation-Date: 2024-10-20 07:35+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -397,7 +397,8 @@ msgid "Algorithm system name" msgstr "" #: amt/site/templates/parts/filter_list.html.j2:99 -msgid "Phase" +#: amt/site/templates/projects/new.html.j2:37 +msgid "Lifecycle" msgstr "" #: amt/site/templates/parts/header.html.j2:7 @@ -602,10 +603,6 @@ msgstr "" msgid "Your algorithm system name here" msgstr "" -#: amt/site/templates/projects/new.html.j2:37 -msgid "Lifecycle" -msgstr "" - #: amt/site/templates/projects/new.html.j2:39 msgid "Select the lifecycle your algorithm system is currently in." msgstr "" diff --git a/amt/locale/en_US/LC_MESSAGES/messages.mo b/amt/locale/en_US/LC_MESSAGES/messages.mo index ff2d43bd6caf604e9e6a02360ed6b6b6d2426be3..83f6740ce03c99aa4007d33ff6fee79a0dd3e5ae 100644 GIT binary patch delta 22 dcmX@ie3*H{1a2b(1p{*{V^eJdqm8pQ7y(Y321Nh> delta 22 dcmX@ie3*H{1a3of1w&&iLkn#KgN?H_7y(Yo21ft@ diff --git a/amt/locale/en_US/LC_MESSAGES/messages.po b/amt/locale/en_US/LC_MESSAGES/messages.po index 3b18d751..2520304a 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-17 13:18+0000\n" +"POT-Creation-Date: 2024-10-20 07:35+0200\n" "PO-Revision-Date: 2024-07-25 21:01+0200\n" "Last-Translator: FULL NAME \n" "Language: en_US\n" @@ -398,7 +398,8 @@ msgid "Algorithm system name" msgstr "" #: amt/site/templates/parts/filter_list.html.j2:99 -msgid "Phase" +#: amt/site/templates/projects/new.html.j2:37 +msgid "Lifecycle" msgstr "" #: amt/site/templates/parts/header.html.j2:7 @@ -603,10 +604,6 @@ msgstr "" msgid "Your algorithm system name here" msgstr "" -#: amt/site/templates/projects/new.html.j2:37 -msgid "Lifecycle" -msgstr "" - #: amt/site/templates/projects/new.html.j2:39 msgid "Select the lifecycle your algorithm system is currently in." msgstr "" @@ -713,3 +710,9 @@ msgstr "" #~ "manner." #~ msgstr "" +#~ msgid "Lifecyle" +#~ msgstr "" + +#~ msgid "Phase" +#~ msgstr "" + diff --git a/amt/locale/nl_NL/LC_MESSAGES/messages.mo b/amt/locale/nl_NL/LC_MESSAGES/messages.mo index 1c81be2b8f8fb80a0a1be4b519e0c6430ca5e466..783970a91a18dc0d23d4b7e1f46ea17aef1b39d7 100644 GIT binary patch delta 2426 zcmYM!e@K;A9LMpmdNpra&Yxw@x~7#)niuV-R&0xkjGD{ak6Bc641+|Xwti7ONu&j} z($!jy1(Rf~g=@PMV)U04V`RuM*jTguAzQ6Kl932?yY>Eb4|LJ{I_EskbH3m6J?B1m zLMKArV21CE@oD4#P5v+W)O-C|=r>zOcM&Ka;;btT^YeX*D zUR0t-FauAc?*9%an`hQVBZq-LoPa}^ixJd{b9g#{dAJ4_BDvW~)I?w780>K47f}gb z#YFrYHP1iJM@Z3ZSl5Yf&uA#KIMP=Mvv497V-VlP$+**vw>mGPO52Mico((exHn>@ zACFpC5zfa-)b&qM2{oaofXy_>!P-$P``+Df1>dIMrdtZu5xCT{` z2293XsDKAhTXGC})V@I7cOjknt3*GzfuB$bb)&{_qe}G~D&SwJ%tuibi(mq#(aFM0 zjK^YZ!4jk>7DjDtFS4ulC-P?xGpN5ZjL-|9pXgfQTc{OO;Q_2cRi+=c757jpdFD(d zx)R9eO99JJ&%cM7ZzXCW+nu{nahp6ED$VDpm3`&>1~pL!D$viEhrL*d_i-iW@f%Yq z>rn|dqAIr^3;CHILY;vNd~LyNNYN~ha_By977Yb1cg{y8vV-%O4Q!1a#o{OR)b2U7L`aHo?&I% zu!??^gQ4py$nH4fAD~t|NR~RBBdEij%Uek=reeO-Uy2#}{fB5MfqK+~`<$m<-N1_i zr!wAyuMVMe6nWgz^LgoDE6%}T=X4H=&cG(r{GXsIy9c#ZP3mic6Eqa~th=ELm3cR+ z#P?8vBgovA!=Oq!8w0oiYp@n|sJc*ruAwS(6BV!zXW$>M9~WQ&%5WSFnS-1wn}RC! zY~+Aj1!{aXYVSYB3iNO$_Mj3RLM;B~XX#nl+;CYbl_Bb7`DsKzni* z6?h00_&?O|HHw-bm3`34C!(IqN3A%7s?0|?4LvNvPB;E5>MT7#J^vWBB~PY$u?do> zw*qFODlx+uM3r&@D&r-n1ZzeM%*?rTL=;w&cMkN72qQSqug(o{({ zqgJ{Hb>Rpqz&X?_xDx|7fJ$ftTkr)cU<=FE%G>zjCvV-T_s1R7e1oV3{Evy~pB_6~ zUK$MrDn(6Hi3+gH^{Y{tZ$urYE$G8~)PxPF(jUfE_${u+$C!kRIdR&erKrGbuoE{R ziFy{Lv5kSO;#esU;u!jE&UVzhx&w7au3$3WKn3VS4zvxRO8o?>uBCD^<1vT-4) delta 2491 zcmYM!e@xVM9LMpGa0eWx2wa3F!j}$ACG0N6nCJR6M7u;PvDzXV+(>Eukvqz2mtU3* z=CURVS2KL}qGUg*JU|be7CX6*0!e-Pu z2`s^GEW)&P#Ll1abj^46i(jyc8~?H6g|oc}@4_w2KY(!@#U*$RpTzPx#^m4*oQpe= z+{|0ZE#@6mqQh8>$58j5#&Y8tbC!!+nfL=s(Z}8Mu?$u5N^~%Wk6|m4qd9_FXbf}l zl$}3=N^lDOsI0V3jx~t+j0@3Ee6xTHWmbu5;R>9G>o9_CSdRPb{D;;vsMcP_8oZ9G zxU$e|{W4Tx4Oov)p}y}&CG-Kh3V4tUk~Jq#m3?h*IFHL1U$FB5qE#?1L3OAOwfD`a zgp;U_?7=+Tj|w=5+LBQ_pFx&1<3;pe4@@wjR-HqQFQ5{ew)59fE&CT0IEQwr0teN( zYCf{D9&f?bn1zpGFSa1fF+ZTT_;+NtjW0z1xi-Z_Q>NAE;N7T7H=-&@VhU5JL}yT) zx{2DFAW>D(QfmyA$a+2$xDB<=cGSABpb9$R+KXXS0!LA;I*F?AwDlX*Lf@kTP2&Rm z3u9QoyY?`~Q5{U95*$J$Jc?mn+astmG0Dd>=w9W5u9`S~(T%OB!0py8sD!qmPWg+d z`*z}O_&O?)_fVCMp|;|p9sgvU5QHsiVGb*9yP9AIz4*NPR)BFE~o#;ZHg>ub>X&?1i3-kmbz%xEVjiI;`M;$W5p-@CIuAehlb=gIuWcqnf~RRNyb| z_!27fUr{X%@}a;rNDQ+E)zSnyxD_|zZq%8&gj)A1sx#M6@ou1d2N!vcHxWT)xZ1h~ zIbUW2s?`bPz?)9g{Hv(F--oO4FfPF>s02fmULm!}_L~M=fvud*)(!IP-de+qTq1gayGdN7-d-!P4T zq5}4it~zr7RdEJ2{~0R4dDKtyG&)#FnMx>%y%<9uevS(K74pwa^1)AlnL+)YxN{eI z3s;~jS&n{;Bj>|Bf(rONYM~S=P_G^Lp$Zs89j^CLfk#m59YSrz7ubY9;|7dy@N)FR z=me_eJ*dF@aTwo4WqRLYPBd;pwe(}m#YyW$)N6Ygb!Ps?JoIxC31A9Pg_NLLUWYW< zG+~xr*zH_6Omv|Z9zeBb2({25R7J<}Asj<>#J|+5un5(G#i;x4!~jMyA7iL>8__sU z%5hq@b|#%29qq}^u1r&4ZJxjL*^b1^nY~2~S+hDa--d4Zg3)`N=<-$3`kF{2Gd1tt U{7i1RJImMDmh8y%RQLM+1ARpAVE_OC diff --git a/amt/locale/nl_NL/LC_MESSAGES/messages.po b/amt/locale/nl_NL/LC_MESSAGES/messages.po index c1124e6e..b5fa9ca5 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-17 13:18+0000\n" +"POT-Creation-Date: 2024-10-20 07:35+0200\n" "PO-Revision-Date: 2024-07-25 21:01+0200\n" "Last-Translator: FULL NAME \n" "Language: nl_NL\n" @@ -416,8 +416,9 @@ msgid "Algorithm system name" msgstr "Algoritme systeem naam" #: amt/site/templates/parts/filter_list.html.j2:99 -msgid "Phase" -msgstr "Fase" +#: amt/site/templates/projects/new.html.j2:37 +msgid "Lifecycle" +msgstr "Levenscyclus" #: amt/site/templates/parts/header.html.j2:7 msgid "Beta Version" @@ -623,10 +624,6 @@ msgstr "Algoritmekader" msgid "Your algorithm system name here" msgstr "Jouw algoritme systeem naam hier" -#: amt/site/templates/projects/new.html.j2:37 -msgid "Lifecycle" -msgstr "Levenscyclus" - #: amt/site/templates/projects/new.html.j2:39 msgid "Select the lifecycle your algorithm system is currently in." msgstr "" @@ -689,9 +686,3 @@ msgstr "Creëer Algoritme Systeem" msgid "Copy results and close" msgstr "Resultaten overnemen en sluiten" -#~ msgid "About us" -#~ msgstr "Over ons" - -#~ msgid "Contact" -#~ msgstr "Contact" - diff --git a/amt/repositories/projects.py b/amt/repositories/projects.py index b2a968fe..0df74d43 100644 --- a/amt/repositories/projects.py +++ b/amt/repositories/projects.py @@ -16,14 +16,14 @@ logger = logging.getLogger(__name__) -def sort_by_phase(project: Project) -> int: +def sort_by_lifecycle(project: Project) -> int: if project.lifecycle: return project.lifecycle.index else: return -1 -def sort_by_phase_reversed(project: Project) -> int: +def sort_by_lifecycle_reversed(project: Project) -> int: if project.lifecycle: return -project.lifecycle.index else: @@ -105,11 +105,11 @@ def paginate( # noqa result = list(self.session.execute(statement).scalars()) # todo: the good way to do sorting is to use an enum field (or any int field) # in the database so we can sort on that - if result and sort and "phase" in sort: - if sort["phase"] == "ascending": - result = sorted(result, key=sort_by_phase) + if result and sort and "lifecycle" in sort: + if sort["lifecycle"] == "ascending": + result = sorted(result, key=sort_by_lifecycle) else: - result = sorted(result, key=sort_by_phase_reversed) + result = sorted(result, key=sort_by_lifecycle_reversed) return result # noqa except Exception as e: logger.exception("Error paginating projects") diff --git a/amt/site/templates/parts/filter_list.html.j2 b/amt/site/templates/parts/filter_list.html.j2 index 18ef734c..534ea4f1 100644 --- a/amt/site/templates/parts/filter_list.html.j2 +++ b/amt/site/templates/parts/filter_list.html.j2 @@ -96,8 +96,8 @@ {{ sort_button('name', sort_by) }} - {% trans %}Phase{% endtrans %} - {{ sort_button('phase', sort_by) }} + {% trans %}Lifecycle{% endtrans %} + {{ sort_button('lifecycle', sort_by) }} {% trans %}Last updated{% endtrans %}