Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed #31006 -- Doc'd backslash escaping in date/time template filters. #12128

Merged
merged 1 commit into from Dec 2, 2019

Conversation

@ryancheley
Copy link
Contributor

ryancheley commented Nov 23, 2019

Fix for Issue 31006

@felixxm

This comment has been minimized.

Copy link
Member

felixxm commented Nov 23, 2019

@ryancheley What do you think about my suggestion? Ticket is also about documenting this in time filter.

@ryancheley

This comment has been minimized.

Copy link
Contributor Author

ryancheley commented Nov 23, 2019

@felixxm I think its a great idea and will make update and commit later today or tomorrow.

It is the {% now "jS \o\f F" %}

This would display as "It is the 4th of September".

This comment has been minimized.

Copy link
@felixxm

felixxm Nov 25, 2019

Member

I don't think that we need a separate example in the date docs. I would rather add a short note to the existing example for es, e.g.

...
outputs ``9 de Enero de 2008`` (the ``DATE_FORMAT`` format specifier for the
``es`` locale is ``r'j \d\e F \d\e Y'``). Both "d" and "e" are
backslash-escaped, because otherwise each is a format string that displays the
day and the timezone name, respectively.

This comment has been minimized.

Copy link
@ryancheley

ryancheley Nov 28, 2019

Author Contributor

OK. I think I see what you're saying. I'll try again over the holiday weekend. Thanks!

This comment has been minimized.

Copy link
@ryancheley

ryancheley Dec 1, 2019

Author Contributor

@felixxm I've made the change suggested. Thanks!

@felixxm felixxm self-assigned this Dec 2, 2019
@felixxm felixxm changed the title Ticket 31006 Fixed #31006 -- Doc'd backslash escaping in date/time template filters. Dec 2, 2019
@felixxm felixxm force-pushed the ryancheley:ticket_31006 branch from 9c43fdc to e177fa7 Dec 2, 2019
@felixxm

This comment has been minimized.

Copy link
Member

felixxm commented Dec 2, 2019

@ryancheley Thanks 👍 I rebased from master and pushed edits.

@felixxm felixxm force-pushed the ryancheley:ticket_31006 branch from e177fa7 to d9f4ea0 Dec 2, 2019
@felixxm felixxm force-pushed the ryancheley:ticket_31006 branch from d9f4ea0 to a1f14ee Dec 2, 2019
@felixxm felixxm merged commit a1f14ee into django:master Dec 2, 2019
25 checks passed
25 checks passed
docs Build #3156 ended
Details
flake8 Build #3152 ended
Details
isort Build #3160 succeeded in 26 sec
Details
pr-mariadb/database=mysql,label=mariadb,python=python3.8 Build #3118 ended
Details
pr-mariadb/database=mysql_gis,label=mariadb,python=python3.8 Build #3118 ended
Details
pull-requests-bionic/database=mysql,label=bionic-pr,python=python3.6 Build #3183 ended
Details
pull-requests-bionic/database=mysql,label=bionic-pr,python=python3.7 Build #3183 ended
Details
pull-requests-bionic/database=mysql,label=bionic-pr,python=python3.8 Build #3183 ended
Details
pull-requests-bionic/database=mysql_gis,label=bionic-pr,python=python3.6 Build #3183 ended
Details
pull-requests-bionic/database=mysql_gis,label=bionic-pr,python=python3.7 Build #3183 ended
Details
pull-requests-bionic/database=mysql_gis,label=bionic-pr,python=python3.8 Build #3183 ended
Details
pull-requests-bionic/database=postgis,label=bionic-pr,python=python3.6 Build #3183 ended
Details
pull-requests-bionic/database=postgis,label=bionic-pr,python=python3.7 Build #3183 ended
Details
pull-requests-bionic/database=postgis,label=bionic-pr,python=python3.8 Build #3183 ended
Details
pull-requests-bionic/database=postgres,label=bionic-pr,python=python3.6 Build #3183 ended
Details
pull-requests-bionic/database=postgres,label=bionic-pr,python=python3.7 Build #3183 ended
Details
pull-requests-bionic/database=postgres,label=bionic-pr,python=python3.8 Build #3183 ended
Details
pull-requests-bionic/database=spatialite,label=bionic-pr,python=python3.6 Build #3183 ended
Details
pull-requests-bionic/database=spatialite,label=bionic-pr,python=python3.7 Build #3183 ended
Details
pull-requests-bionic/database=spatialite,label=bionic-pr,python=python3.8 Build #3183 ended
Details
pull-requests-bionic/database=sqlite3,label=bionic-pr,python=python3.6 Build #3183 ended
Details
pull-requests-bionic/database=sqlite3,label=bionic-pr,python=python3.7 Build #3183 ended
Details
pull-requests-bionic/database=sqlite3,label=bionic-pr,python=python3.8 Build #3183 ended
Details
pull-requests-javascript Build #3158 ended
Details
pull-requests-windows/database=sqlite3,label=windows,python=Python38 Build #3116 ended
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.