From: Tom Hughes Date: Tue, 11 Feb 2025 17:53:00 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/5637' X-Git-Tag: live~294 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/62613e7b479ce351daec94798f1a63b8946d979c?hp=4252069afd6c991138f36d55a14838fba67703a5 Merge remote-tracking branch 'upstream/pull/5637' --- diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index aea8b30b9..46fe63bb2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -87,7 +87,7 @@ and why it should be the way it is. ## i18n -If you make a change that involve the locale files (in `config/locales`) then please +If you make a change that involves the locale files (in `config/locales`) then please only submit changes to the `en.yml` file. The other files are updated via [Translatewiki](https://translatewiki.net/wiki/Translating:OpenStreetMap) and should not be included in your pull request. @@ -143,7 +143,7 @@ with making the reviews as straightforward as possible: large to review in one sitting, or if changes are requested, then the maintainer needs to repeatedly re-read code that has already been considered. * The commit history is important. This is a large codebase, developed over many - years by many developers. We frequently need to read the commit history (e.g. + years by many developers. We frequently need to read the commit history (for example using `git blame`) to figure out what is going on. So small, understandable, and relevant commits are important for other developers looking back at your work in future.