Skip to content

Commit 85063e0

Browse files
Merge branch 'development' into add_scss_to_editorconfig
2 parents 951bae2 + 66cb809 commit 85063e0

27 files changed

Lines changed: 273 additions & 142 deletions

File tree

Dangerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ has_test_changes = !git.modified_files.grep(/spec/).empty?
77
if git.lines_of_code > 50 && has_app_changes && !has_test_changes
88
warn('There are code changes, but no corresponding tests. ' \
99
'Please include tests if this PR introduces any modifications in ' \
10-
'behavior.',
10+
'behavior. \n
11+
Ignore this warning if the PR ONLY contains translation.io synced updates.',
1112
sticky: false)
1213
end
1314

@@ -25,7 +26,7 @@ warn('PR is classed as Work in Progress') if github.pr_title.include? '[WIP]'
2526
declared_trivial = (github.pr_title + github.pr_body).include?('#trivial') || !has_app_changes
2627

2728
if !git.modified_files.include?('CHANGELOG.md') && !declared_trivial
28-
raise(
29+
failure(
2930
"Please include a CHANGELOG entry. \n
3031
You can find it at [CHANGELOG.md](https://github.com/DMPRoadmap/roadmap/blob/main/CHANGELOG.md).",
3132
sticky: false

config/locale/app.pot

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: DMPRoadmap-Development 1.0\n"
1010
"Report-Msgid-Bugs-To: contact@translation.io\n"
11-
"POT-Creation-Date: 2022-11-30 14:11-0500\n"
12-
"PO-Revision-Date: 2022-11-30 14:11-0500\n"
11+
"POT-Creation-Date: 2022-12-09 10:34-0500\n"
12+
"PO-Revision-Date: 2022-12-09 10:34-0500\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
1515
"Language: \n"
@@ -1073,6 +1073,10 @@ msgstr ""
10731073
msgid "Grant API to organisations"
10741074
msgstr ""
10751075

1076+
#: ../../app/helpers/perms_helper.rb:17
1077+
msgid "Review organisational plans"
1078+
msgstr ""
1079+
10761080
#: ../../app/helpers/plans_helper.rb:8
10771081
#: ../../app/views/paginable/plans/_index.html.erb:8
10781082
#: ../../app/views/paginable/plans/_org_admin.html.erb:21
0 Bytes
Binary file not shown.

config/locale/de/app.po

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: DMPRoadmap-Development 1.0\n"
99
"Report-Msgid-Bugs-To: contact@translation.io\n"
10-
"POT-Creation-Date: 2022-11-30 14:11-0500\n"
11-
"PO-Revision-Date: 2022-11-30 20:11+0100\n"
10+
"POT-Creation-Date: 2022-12-09 10:34-0500\n"
11+
"PO-Revision-Date: 2022-12-09 16:34+0100\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313
"Language-Team: German\n"
1414
"Language: de\n"
@@ -1142,6 +1142,10 @@ msgstr "Verwalten Sie Organisationsdetails"
11421142
msgid "Grant API to organisations"
11431143
msgstr "Gewähren Sie API für Organisationen"
11441144

1145+
#: ../../app/helpers/perms_helper.rb:17
1146+
msgid "Review organisational plans"
1147+
msgstr ""
1148+
11451149
#: ../../app/helpers/plans_helper.rb:8
11461150
#: ../../app/views/paginable/plans/_index.html.erb:8
11471151
#: ../../app/views/paginable/plans/_org_admin.html.erb:21
80 Bytes
Binary file not shown.

config/locale/en/app.po

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: DMPRoadmap-Development 1.0\n"
99
"Report-Msgid-Bugs-To: contact@translation.io\n"
10-
"POT-Creation-Date: 2022-11-30 14:11-0500\n"
11-
"PO-Revision-Date: 2022-11-30 14:11-0500\n"
10+
"POT-Creation-Date: 2022-12-09 10:34-0500\n"
11+
"PO-Revision-Date: 2022-12-09 10:35-0500\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313
"Language-Team: English\n"
1414
"Language: en\n"
@@ -1122,6 +1122,10 @@ msgstr "Manage organisation details"
11221122
msgid "Grant API to organisations"
11231123
msgstr "Grant API to organisations"
11241124

1125+
#: ../../app/helpers/perms_helper.rb:17
1126+
msgid "Review organisational plans"
1127+
msgstr "Review organisational plans"
1128+
11251129
#: ../../app/helpers/plans_helper.rb:8
11261130
#: ../../app/views/paginable/plans/_index.html.erb:8
11271131
#: ../../app/views/paginable/plans/_org_admin.html.erb:21
0 Bytes
Binary file not shown.

config/locale/en_CA/app.po

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: DMPRoadmap-Development 1.0\n"
99
"Report-Msgid-Bugs-To: contact@translation.io\n"
10-
"POT-Creation-Date: 2022-11-30 14:11-0500\n"
11-
"PO-Revision-Date: 2022-11-30 20:11+0100\n"
10+
"POT-Creation-Date: 2022-12-09 10:34-0500\n"
11+
"PO-Revision-Date: 2022-12-09 16:34+0100\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313
"Language-Team: English\n"
1414
"Language: en_CA\n"
@@ -1073,6 +1073,10 @@ msgstr ""
10731073
msgid "Grant API to organisations"
10741074
msgstr ""
10751075

1076+
#: ../../app/helpers/perms_helper.rb:17
1077+
msgid "Review organisational plans"
1078+
msgstr ""
1079+
10761080
#: ../../app/helpers/plans_helper.rb:8
10771081
#: ../../app/views/paginable/plans/_index.html.erb:8
10781082
#: ../../app/views/paginable/plans/_org_admin.html.erb:21
0 Bytes
Binary file not shown.

config/locale/en_GB/app.po

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: DMPRoadmap-Development 1.0\n"
99
"Report-Msgid-Bugs-To: contact@translation.io\n"
10-
"POT-Creation-Date: 2022-11-30 14:11-0500\n"
11-
"PO-Revision-Date: 2022-11-30 20:11+0100\n"
10+
"POT-Creation-Date: 2022-12-09 10:34-0500\n"
11+
"PO-Revision-Date: 2022-12-09 16:34+0100\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313
"Language-Team: English\n"
1414
"Language: en_GB\n"
@@ -1073,6 +1073,10 @@ msgstr ""
10731073
msgid "Grant API to organisations"
10741074
msgstr ""
10751075

1076+
#: ../../app/helpers/perms_helper.rb:17
1077+
msgid "Review organisational plans"
1078+
msgstr ""
1079+
10761080
#: ../../app/helpers/plans_helper.rb:8
10771081
#: ../../app/views/paginable/plans/_index.html.erb:8
10781082
#: ../../app/views/paginable/plans/_org_admin.html.erb:21

0 commit comments

Comments
 (0)