From 4bf887c46e3eb10f37327d99a13ed8ea205aaf78 Mon Sep 17 00:00:00 2001 From: max/sooulix Date: Thu, 15 Aug 2024 06:19:22 +0200 Subject: [PATCH] [ui] volunteer part improved --- messages.pot | 6 +- templates/partials/basics.html | 6 -- templates/partials/volunteer.html | 99 ++++++++++++------------ templates/partials/work.html | 8 +- translations/en/LC_MESSAGES/messages.mo | Bin 1997 -> 2039 bytes translations/en/LC_MESSAGES/messages.po | 6 +- translations/fr/LC_MESSAGES/messages.mo | Bin 2118 -> 2165 bytes translations/fr/LC_MESSAGES/messages.po | 6 +- 8 files changed, 68 insertions(+), 63 deletions(-) diff --git a/messages.pot b/messages.pot index e99e58b..0c8e561 100644 --- a/messages.pot +++ b/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-08-15 05:37+0200\n" +"POT-Creation-Date: 2024-08-15 05:58+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -100,6 +100,10 @@ msgstr "" msgid "resume volunteer title" msgstr "" +#: templates/partials/volunteer.html:39 templates/partials/work.html:34 +msgid "resume present phrase" +msgstr "" + #: templates/partials/work.html:5 msgid "resume work title" msgstr "" diff --git a/templates/partials/basics.html b/templates/partials/basics.html index 20e63c5..292f369 100644 --- a/templates/partials/basics.html +++ b/templates/partials/basics.html @@ -16,12 +16,6 @@ {% if basics.location %} - {% if basics.location.address %} - {{ basics.location.address }}, - {% endif %} - {% if basics.location.postalCode %} - {{ basics.location.postalCode }}, - {% endif %} {% if basics.location.city %} {{ basics.location.city }}, {% endif %} diff --git a/templates/partials/volunteer.html b/templates/partials/volunteer.html index 330e1ac..32cca46 100644 --- a/templates/partials/volunteer.html +++ b/templates/partials/volunteer.html @@ -19,74 +19,73 @@ {% endif %}
-
+
{% if volunteer_item.position %} -
- {{ volunteer_item.position }} -
+
+ {{ volunteer_item.position }} +
{% endif %} -
- {{ volunteer_item.organization }} +
+ {% if volunteer_item.startDate %} + {{ utils.format_date_short(volunteer_item.startDate) }} + {% endif %} + {% if not utils.isinfinite(volunteer_item.endDate) %} + - {{ utils.format_date_short(volunteer_item.endDate) }} + {% else %} + - {% trans %}resume present phrase{% endtrans %} + {% endif %}
-
- {% if volunteer_item.startDate %} - - {{ volunteer_item.startDate }} - - {% endif %} - {% if volunteer_item.endDate %} - - - {{ volunteer_item.endDate }} - - {% else %} - - - {{ language.phrases.present }} - +
+ + {{ volunteer_item.organization }} + {% if volunteer_item.url %} + + + (website) + + {% endif %}
+
{% endif %} - {% if volunteer_item.url %} -
- {{ volunteer_item.url }} -
- {% endif %} + {% if volunteer_item.location %} - - - {% if volunteer_item.city %} - - {{ volunteer_item.city }}, - - {% endif %} - {% if volunteer_item.countryCode %} - - ({{ volunteer_item.countryCode }}) - - {% endif %} - {% if volunteer_item.region %} - - {{ volunteer_item.region }} - - {% endif %} - + + + {% if volunteer_item.city %} + + {{ volunteer_item.city }}, + + {% endif %} + {% if volunteer_item.countryCode %} + + ({{ volunteer_item.countryCode }}) + + {% endif %} + {% if volunteer_item.region %} + + {{ volunteer_item.region }} + + {% endif %} + {% endif %} {% if volunteer_item.keywords %} -
    - {% for keyword in volunteer_item.keywords %} -
  • {{ keyword }}
    • - {% endfor %} -
+
    + {% for keyword in volunteer_item.keywords %} +
  • {{ keyword }}
    • + {% endfor %} +
{% endif %}
{% if volunteer_item.summary %}
{{ volunteer_item.summary | replace("\r\n", "
") | replace("\n", "
") | replace("\r", "
") }}
{% endif %} {% if volunteer_item.highlights %} -
    +
      {% for highlight in volunteer_item.highlights %} -
    • {{ highlight | replace("\r\n", "
      ") | replace("\n", "
      ") | replace("\r", "
      ") }}
      • +
    • {{ highlight | replace("\r\n", "
      ") | replace("\n", "
      ") | replace("\r", "
      ") }}
      • {% endfor %}
    {% endif %} diff --git a/templates/partials/work.html b/templates/partials/work.html index f509aa5..9ca5f05 100644 --- a/templates/partials/work.html +++ b/templates/partials/work.html @@ -26,18 +26,18 @@ {% endif %}
    {% if work_item.startDate %} - {{ utils.format_date_short(work_item.startDate) }} + {{ utils.format_date_short(work_item.startDate) }} {% endif %} {% if not utils.isinfinite(work_item.endDate) %} - - {{ utils.format_date_short(work_item.endDate) }} + - {{ utils.format_date_short(work_item.endDate) }} {% else %} - - {{ language.phrases.present }} + - {% trans %}resume present phrase{% endtrans %} {% endif %}
- + {{ work_item.name }} {% if work_item.url %} diff --git a/translations/en/LC_MESSAGES/messages.mo b/translations/en/LC_MESSAGES/messages.mo index 0f96f81f403d3aa557569d329363da758fa60bed..acff6f1a141633a6b5d19092a2f0b2701dfb4af6 100644 GIT binary patch delta 617 zcmYMwJxD@P6u|NG{H!oF`;LZ)3W8_|g2G&)SrFF<8iZU*Qfi2hngxfbwgy|H7<6iml||RQk(@P5jzKAlO_GH3!TQJ{_GnA}mVJDkeVQZn3jU6?bjqD_(WtB! zlrl@9lx$>YvQ~ET{h3p4@4e4G=iPhG?S6;%Vfif;+cicXZ!d3upy+=LN6cb`Iqb%~ zJB3-|dAEce#M_v{6U^Y1=bx~XxbAt2{_QVYmWh50H4--A@hqyq5~}bzcHutiAQzs0 z^!x{^u}-UfY1FL50W(%MD>2c+EmVVJUvP_Q;%D6CR_e%O%gtsXu3{^0 zAdgk}wBrFL@YM5{?hUq(uelG()8Ae_@$P=QU+xd8U?ScyiEYF^?f~i_qizA&Vv}wW z)p*98L*2+C<}_Jjq6T}YLPw|uXQ)Eg{{OBz9w`RZ!{|#885ygtG@S=K`FQOY)Os`( diff --git a/translations/en/LC_MESSAGES/messages.po b/translations/en/LC_MESSAGES/messages.po index b2d6acd..7ccbd75 100644 --- a/translations/en/LC_MESSAGES/messages.po +++ b/translations/en/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-08-15 05:37+0200\n" +"POT-Creation-Date: 2024-08-15 05:58+0200\n" "PO-Revision-Date: 2024-08-14 18:17+0200\n" "Last-Translator: FULL NAME \n" "Language: en\n" @@ -101,6 +101,10 @@ msgstr "Beginner" msgid "resume volunteer title" msgstr "Volunteer" +#: templates/partials/volunteer.html:39 templates/partials/work.html:34 +msgid "resume present phrase" +msgstr "Now" + #: templates/partials/work.html:5 msgid "resume work title" msgstr "Professional experience" diff --git a/translations/fr/LC_MESSAGES/messages.mo b/translations/fr/LC_MESSAGES/messages.mo index f35c4f5d0016d13ae6a7aaac7584cb4b9fa734af..833a7ab5f6a68b5ca9896974ae2709eb9efa528a 100644 GIT binary patch delta 652 zcmYMyKS)AR6vy%N{FB)~Oe^gVBGDQV6f{UnMl}TuOZU4H1M8MKsh95kwG8eGeY!;d`I^yXU@po=@w6??C=B=s6UQ5zZmbxTER+NV-Hk z#1#5*9XoIf`*GhaV=wvAtYIIyfkFJl9(22#^AQY-H~#%TAd$7oll@XKnnG~tknw`roS9B=%#Rmy0DJAuz|YK2kJ&%Z?hi7 z5P2L+yscUEk?&eW+VBC}@fD-^g<21CQ3tqazhU&#UnUsPL#E9cN2ov9iFsjGF{OoTo47TfP`|;u`GbRG54)=|WJ==Li3#k&CDi}O rnz>n7aAlm1bS}NU8_Q;P)^h2}nfuvsO-@yc-g~E|cCMxJitp_YO{714 delta 616 zcmYMxFGvGn7{~GFZZ~f_H@4|?qHf@lO;k7pqe(UdiwMHNq9&U`gawmD2BJ+6EG8Me zU|X<=3pVANT5K9b1%tuwgAaJz@p*sm^ZvWLuiQx$)Om}j^BTy;vV(c{mqQvl@C@Ov4;5br~33C!tTh~3PQ;!+ N6S;OW_KsTN%P&n)HWUB= diff --git a/translations/fr/LC_MESSAGES/messages.po b/translations/fr/LC_MESSAGES/messages.po index fd6268d..40c849e 100644 --- a/translations/fr/LC_MESSAGES/messages.po +++ b/translations/fr/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-08-15 05:37+0200\n" +"POT-Creation-Date: 2024-08-15 05:58+0200\n" "PO-Revision-Date: 2024-08-14 18:17+0200\n" "Last-Translator: FULL NAME \n" "Language: fr\n" @@ -101,6 +101,10 @@ msgstr "Débutant" msgid "resume volunteer title" msgstr "Bénévolat" +#: templates/partials/volunteer.html:39 templates/partials/work.html:34 +msgid "resume present phrase" +msgstr "Présent" + #: templates/partials/work.html:5 msgid "resume work title" msgstr "Expérience Professionnelle"