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

Fix duration_short format for french translation #297

Merged
merged 9 commits into from
Sep 2, 2018
Merged

Fix duration_short format for french translation #297

merged 9 commits into from
Sep 2, 2018

Conversation

jeau
Copy link
Contributor

@jeau jeau commented Sep 2, 2018

to correct the format of the durations in the French translation

thank you

@kevinpapst
Copy link
Member

Its well documented: https://en.wikipedia.org/wiki/Date_and_time_notation_in_France
I should have looked it up before ;-)
Thanks!

@kevinpapst
Copy link
Member

Oh, and a side note - just a tip if you want to improve your git skills:
You should fast-forward your fork to my master by setting this repo as upstream and then fetching the changes into your repo. You pushed 9 commits, which is kind of wrong.
Best is always to only work on branches and sent those in as PRs.
Then you can delete them after I merged and you can easily keep your master clean and up-to-date with this repository.

@kevinpapst kevinpapst merged commit 4ede546 into kimai:master Sep 2, 2018
@jeau
Copy link
Contributor Author

jeau commented Sep 2, 2018

thanks for your advice

I will try to better understand how git works, especially the branches

@kevinpapst kevinpapst added this to the 0.5 - Invoice milestone Sep 21, 2018
@lock
Copy link

lock bot commented Nov 20, 2018

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot locked and limited conversation to collaborators Nov 20, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants