Skip to content

Commit

Permalink
Merge pull request digitalfox#104 from pyoupyou/prepare_v1.6
Browse files Browse the repository at this point in the history
Prepare v1.6
  • Loading branch information
bport authored Jul 9, 2020
2 parents 45f5174 + eec1b6d commit 33c3ed6
Show file tree
Hide file tree
Showing 5 changed files with 111 additions and 112 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# 1.6.0 (2020-06-15)
# 1.6.0 (2020-07-09)
- Add gantt diagram to show contract start date
- Add list of active sources
- Update django to last patch version (2.2.13)

# 1.5.0 (2020-05-28)
- Speed up interviews export
Expand Down
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ django-ical = "==1.4"
django-markwhat = "==1.6.1"
commonmark = "==0.8.1"
django-bleach = "==0.3.0"
Django = "==2.2.12"
Django = "==2.2.13"
django-split-settings = "==0.3.0"
requests = '*'
django-filter = "*"
Expand Down
184 changes: 96 additions & 88 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 6 additions & 16 deletions locale/fr/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -279,12 +279,10 @@ msgid "All"
msgstr "Toutes"

#: interview/templates/interview/active-sources.html:33
#, fuzzy
msgid "Active sources: "
msgstr "Sources actives"

#: interview/templates/interview/active-sources.html:35
#, fuzzy
msgid "Active sources"
msgstr "Sources actives"

Expand Down Expand Up @@ -314,10 +312,8 @@ msgid "Arrival planning"
msgstr "Suivi des arrivées"

#: interview/templates/interview/base.html:54
#, fuzzy
#| msgid "Source"
msgid "Sources"
msgstr "source"
msgstr "sources"

#: interview/templates/interview/base.html:57
msgid "Admin"
Expand Down Expand Up @@ -496,10 +492,8 @@ msgstr "Détails"

#: interview/templates/interview/tables/source_name.html:3
#: interview/views.py:922
#, fuzzy
#| msgid "Closed processes"
msgid "Processes"
msgstr "Processus terminés"
msgstr "Processus"

#: interview/views.py:55
msgid "No itw"
Expand Down Expand Up @@ -543,28 +537,24 @@ msgid "Type"
msgstr ""

#: interview/views.py:921
#, fuzzy
#| msgid "Related processes"
msgid "Active processes"
msgstr "Mes processus"
msgstr "processus actif"

#: interview/views.py:923
msgid "Hired"
msgstr ""
msgstr "Embauché"

#: interview/views.py:924
msgid "Ratio"
msgstr ""

#: interview/views.py:925
#, fuzzy
#| msgid "Offer"
msgid "Offers"
msgstr "Offre"
msgstr "Offres"

#: interview/views.py:926
msgid "Last change"
msgstr ""
msgstr "Dernier changement"

#: ref/admin.py:11
msgid "Personal info"
Expand Down
Loading

0 comments on commit 33c3ed6

Please sign in to comment.