From: Thomas Citharel <tcit@tcit.fr>
Date: Thu, 18 Feb 2016 19:35:35 +0000 (+0100)
Subject: Merge pull request #1693 from wallabag/v2-issue-template
X-Git-Tag: 2.0.0-beta.1~25
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=fa64d861105bd0713acd7ac5d116353273524b4f;hp=befa6f2fe91337469a603c982821523787099ab3;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #1693 from wallabag/v2-issue-template

Fix #1691 create ISSUE_TEMPLATE and PULL_REQUEST_TEMPLATE
---

diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to .github/CONTRIBUTING.md
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..bfd3d4d0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,13 @@
+### Issue details
+
+_Please provide issue details here_.
+
+### Steps to reproduce/test case
+
+_Please provide necessary steps for reproduction of this issue, or better the
+reduced test case (without any external dependencies, if possible)_.
+
+### Affected version(s)
+
+_Please fill in affected version(s)_
+
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..b761f8f2
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,11 @@
+| Q             | A
+| ------------- | ---
+| Bug fix?      | yes|no
+| New feature?  | yes|no
+| BC breaks?    | yes|no
+| Deprecations? | yes|no
+| Tests pass?   | yes|no
+| Documentation | yes|no
+| Translation   | yes|no
+| Fixed tickets | comma-separated list of tickets fixed by the PR, if any
+| License       | MIT
diff --git a/docs/en/developer/translate.rst b/docs/en/developer/translate.rst
index 138d128c..85cf2563 100644
--- a/docs/en/developer/translate.rst
+++ b/docs/en/developer/translate.rst
@@ -4,6 +4,10 @@ Translate wallabag
 Translation files
 -----------------
 
+.. note::
+
+    As wallabag is mainly developed by a French team, please consider that french translation is the most updated one and please copy it to create your own translation.
+
 You can find translation files here: https://github.com/wallabag/wallabag/tree/v2/src/Wallabag/CoreBundle/Resources/translations.
 
 You have to create ``messages.CODE.yml`` and ``validators.CODE.yml``, where CODE is the the ISO 639-1 code of your language (`see wikipedia <https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes>`__).