Skip to content

Commit 2cd3cb0

Browse files
dkastlosgeoweblate
dkastl
and
osgeoweblate
authored
Merge next into main (#49)
* Weblate (#39) * Added translation using Weblate (German) * Translated using Weblate (German) Currently translated at 100.0% (2 of 2 strings) Translation: GTT Project/Redmine GTT SMASH plugin Translate-URL: https://weblate.osgeo.org/projects/gtt-project/redmine_gtt_smash/de/ * Revert "Weblate (#39)" (#40) This reverts commit bae6894. * Added translation using Weblate (German) * Translated using Weblate (German) Currently translated at 100.0% (2 of 2 strings) Translation: GTT Project/Redmine GTT SMASH plugin Translate-URL: https://weblate.osgeo.org/projects/gtt-project/redmine_gtt_smash/de/ * Update README.md * Adds basic docs Signed-off-by: Daniel Kastl <daniel@georepublic.de> * Fixes de localization Signed-off-by: Daniel Kastl <daniel@georepublic.de> * Markdown linted Signed-off-by: Daniel Kastl <daniel@georepublic.de> * Translated using OSGeo Weblate (German) (#48) Currently translated at 100.0% (7 of 7 strings) Translation: GTT Project/Redmine GTT SMASH plugin Translate-URL: https://weblate.osgeo.org/projects/gtt-project/redmine_gtt_smash/de/ Co-authored-by: Daniel Kastl <daniel@georepublic.de> * Format fixes Signed-off-by: Daniel Kastl <daniel@georepublic.de> * Reverts to new images Signed-off-by: Daniel Kastl <daniel@georepublic.de> * Prepares release Signed-off-by: Daniel Kastl <daniel@georepublic.de> * Ensure compatibility with Redmine 6 (#51) * Ensure compatibility with Redmine 6 Increase miminum required version to Redmine 5.0.0 Enhances Markdown formatting Removes uneccessary boxes in settings * Cleanup formatting in getting-started documentation --------- Signed-off-by: Daniel Kastl <daniel@georepublic.de> Co-authored-by: OSGeo Weblate <97247866+osgeoweblate@users.noreply.github.com>
1 parent 871cf07 commit 2cd3cb0

File tree

7 files changed

+90
-67
lines changed

7 files changed

+90
-67
lines changed

‎README.md

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,68 +11,78 @@ The Geo-Task-Tracker (GTT) S.M.A.S.H plugin adds support for the mobile app [S.M
1111

1212
## Requirements
1313

14-
Redmine GTT S.M.A.S.H **requires PostgreSQL/PostGIS** and will not work with SQLite or MariaDB/MySQL!!!
14+
Redmine GTT S.M.A.S.H **requires PostgreSQL/PostGIS** and will not work with
15+
SQLite or MariaDB/MySQL!!!
1516

16-
- Redmine >= 4.2.0
17+
- Redmine >= 5.0.0
1718
- [redmine_gtt](https://github.com/gtt-project/redmine_gtt/) plugin
1819

1920
## Installation
2021

21-
To install Redmine GTT S.M.A.S.H plugin, download or clone this repository in your Redmine installation plugins directory!
22+
To install Redmine GTT S.M.A.S.H plugin, download or clone this repository in
23+
your Redmine installation plugins directory!
2224

23-
```
25+
```sh
2426
cd path/to/plugin/directory
2527
git clone https://github.com/gtt-project/redmine_gtt_smash.git
2628
```
2729

2830
Then run
2931

30-
```
32+
```sh
3133
bundle install
3234
bundle exec rake redmine:plugins:migrate
3335
```
3436

35-
After restarting Redmine, you should be able to see the Redmine GTT SMASH plugin in the Plugins page.
37+
After restarting Redmine, you should be able to see the Redmine GTT SMASH plugin
38+
in the Plugins page.
3639

37-
More information on installing (and uninstalling) Redmine plugins can be found here: http://www.redmine.org/wiki/redmine/Plugins
40+
More information on installing (and uninstalling) Redmine plugins can be found
41+
in [Redmine Plugins](http://www.redmine.org/wiki/redmine/Plugins) documentation.
3842

3943
## How to use
4044

41-
- Make sure REST web services is enabled: http://localhost:3000/settings?tab=api
45+
- Make sure REST web services is enabled: [http://localhost:3000/settings?tab=api](http://localhost:3000/settings?tab=api)
4246
- Enable the plugin in project settings
4347

44-
The Geo-Task-Tracker (GTT) S.M.A.S.H plugin connects the S.M.A.S.H mobile app with Redmine GTT.
45-
It adds new API endpoints to provide the tracker type configuration as custom notes.
48+
The Geo-Task-Tracker (GTT) S.M.A.S.H plugin connects the S.M.A.S.H mobile app
49+
with Redmine GTT.
50+
It adds new API endpoints to provide the tracker type configuration as custom notes.
4651

47-
For more information with screenshots see the [Getting Started](doc/getting-started.md) guide.
52+
For more information with screenshots see the [Getting Started](doc/getting-started.md)
53+
guide.
4854

49-
**Project level API endpoint**
55+
### Project level API endpoint
5056

51-
```
57+
```txt
5258
http://localhost:3000/projects/(project_id)/smash/tags.json
5359
```
5460

55-
**Global level API endpoint**
61+
### Global level API endpoint**
5662

57-
```
58-
http://localhost:3000/smash/tags.json
63+
```txt
64+
http://localhost:3000/smash/tags.json
5965
```
6066

61-
**Default tracker setting API endpoint**
67+
### Default tracker setting API endpoint
6268

63-
```
69+
```txt
6470
http://localhost:3000/smash/settings.json
6571
```
6672

6773
## Contributing and Support
6874

69-
The GTT Project appreciates any [contributions](https://github.com/gtt-project/.github/blob/main/CONTRIBUTING.md)! Feel free to contact us for [reporting problems and support](https://github.com/gtt-project/.github/blob/main/CONTRIBUTING.md).
75+
The GTT Project appreciates any [contributions](https://github.com/gtt-project/.github/blob/main/CONTRIBUTING.md)!
76+
Feel free to contact us for [reporting problems and support](https://github.com/gtt-project/.github/blob/main/CONTRIBUTING.md).
7077

71-
## Version History
78+
Help us to translate GTT Project using [OSGeo Weblate](https://weblate.osgeo.org/engage/gtt-project/):
79+
80+
[![Translation status](https://weblate.osgeo.org/widgets/gtt-project/-/redmine_gtt_smash/multi-auto.svg)](https://weblate.osgeo.org/engage/gtt-project/)
7281

73-
- 2.0.0 Support more SMASH data types by adding tracker setting with API endpoint
82+
## Version History
7483

75-
See [all releases](https://github.com/gtt-project/redmine_gtt_smash/releases) with release notes.
84+
See [all releases](https://github.com/gtt-project/redmine_gtt_smash/releases)
85+
with release notes.
7686

7787
## Authors
7888

@@ -84,4 +94,3 @@ See [all releases](https://github.com/gtt-project/redmine_gtt_smash/releases) wi
8494
## LICENSE
8595

8696
This program is free software. See [LICENSE](LICENSE) for more information.
87-

‎app/views/gtt_smash/_settings.html.erb

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,30 @@
1-
<div class="box tabular settings">
2-
<%
3-
@options = ["None"]
4-
Tracker.all.sort.each do |t|
5-
@options.push([t.name,t.id])
6-
end
7-
%>
8-
<h3><%= l(:setting_message) %></h3>
1+
<%
2+
@options = ["None"]
3+
Tracker.all.sort.each do |t|
4+
@options.push([t.name,t.id])
5+
end
6+
%>
7+
<h3><%= l(:setting_message) %></h3>
98

10-
<p>
11-
<%= content_tag(:label, l(:field_tracker_simple_note)) %>
12-
<%= select_tag "settings[tracker_simple_notes]",
13-
options_for_select(@options, @settings['tracker_simple_notes']) %>
14-
</p>
9+
<p>
10+
<%= content_tag(:label, l(:field_tracker_simple_note)) %>
11+
<%= select_tag "settings[tracker_simple_notes]",
12+
options_for_select(@options, @settings['tracker_simple_notes']) %>
13+
</p>
1514

16-
<p>
17-
<%= content_tag(:label, l(:field_tracker_photo_note)) %>
18-
<%= select_tag "settings[tracker_photo_notes]",
19-
options_for_select(@options, @settings['tracker_photo_notes']) %>
20-
</p>
15+
<p>
16+
<%= content_tag(:label, l(:field_tracker_photo_note)) %>
17+
<%= select_tag "settings[tracker_photo_notes]",
18+
options_for_select(@options, @settings['tracker_photo_notes']) %>
19+
</p>
2120

22-
<p>
23-
<%= content_tag(:label, l(:field_tracker_gps_log)) %>
24-
<%= select_tag "settings[tracker_gps_logs]",
25-
options_for_select(@options, @settings['tracker_gps_logs']) %>
26-
</p>
21+
<p>
22+
<%= content_tag(:label, l(:field_tracker_gps_log)) %>
23+
<%= select_tag "settings[tracker_gps_logs]",
24+
options_for_select(@options, @settings['tracker_gps_logs']) %>
25+
</p>
2726

28-
<p>
29-
<%= content_tag(:label, l(:field_default_subject)) %>
30-
<%= text_field_tag 'settings[default_subject]', @settings['default_subject'], :size => 30 %>
31-
</p>
32-
</div>
27+
<p>
28+
<%= content_tag(:label, l(:field_default_subject)) %>
29+
<%= text_field_tag 'settings[default_subject]', @settings['default_subject'], :size => 30 %>
30+
</p>

‎config/locales/de.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
de:
2+
permission_view_gtt_smash: GTT SMASH ansehen
3+
project_module_gtt_smash: GTT SMASH
4+
5+
field_tracker_simple_note: Tracker für Simple Notes
6+
field_tracker_photo_note: Tracker für Photo Notes
7+
field_tracker_gps_log: Tracker für GPS Logs
8+
field_default_subject: Standard-Thema
9+
10+
setting_message: 'Achtung: Vergewissern Sie sich, dass die ausgewählten Tracker keine erforderlichen benutzerdefinierten Felder haben!'

‎config/locales/en.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ en:
66
field_tracker_photo_note: "Tracker for Photo Notes"
77
field_tracker_gps_log: "Tracker for GPS Logs"
88
field_default_subject: "Default subject"
9-
10-
setting_message: "Caution: ensure that selected trackers do not have required custom fields!"
9+
10+
setting_message: "Caution: ensure that selected trackers do not have required custom fields!"

‎config/locales/ja.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ ja:
77
field_tracker_gps_log: "GPSログ用トラッカー"
88
field_default_subject: "デフォルトの題名"
99

10-
setting_message: "注意: 選択したトラッカーに必須カスタムフィールドがないことを確認してください!"
10+
setting_message: "注意: 選択したトラッカーに必須カスタムフィールドがないことを確認してください!"

‎doc/getting-started.md

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
# Getting Started with GTT SMASH plugin
22

3-
The **Redmine GTT SMASH** plugin allows you to connect your [Redmine GTT](https://gtt-project.org/) projects with the [SMASH mobile app](https://www.geopaparazzi.org/smash/index.html) to create field notes and upload them as issues to [Redmine](https://redmine.org/).
3+
The **Redmine GTT SMASH** plugin allows you to connect your [Redmine GTT](https://gtt-project.org/)
4+
projects with the [SMASH mobile app](https://www.geopaparazzi.org/smash/index.html)
5+
to create field notes and upload them as issues to [Redmine](https://redmine.org/).
46

5-
SMASH is a digital field mapping application developed to perform fast qualitative engineering/geologic surveys and GIS data collection.
7+
SMASH is a digital field mapping application developed to perform fast
8+
qualitative engineering/geologic surveys and GIS data collection.
69

710
## Installing SMASH
811

@@ -11,28 +14,29 @@ You can install the SMASH app from the app stores:
1114
* *SMASH Digital field mapping* for iOS devices on the [Apple Store](https://apps.apple.com/us/app/smash-digital-field-mapping/id1475079936).
1215
* *SMASH field mapping* for Android devices on the [Google Play store](https://play.google.com/store/apps/details?id=eu.hydrologis.smash&hl=en).
1316

14-
The following plugin documentation gives a brief introduction to how to use SMASH with Redmine.
17+
The following plugin documentation gives a brief introduction to how to use
18+
SMASH with Redmine.
1519

1620
SMASH provides additional functionality that is available in the [SMASH User Manual](https://www.geopaparazzi.org/smash/index.html).
1721

1822
## Integration in Redmine GTT
1923

20-
To get projects connected with the SMASH mobile application make sure to enable the **GTT SMASH** module in your Redmine project settings.
24+
To get projects connected with the SMASH mobile application make sure to enable
25+
the **GTT SMASH** module in your Redmine project settings.
2126

2227
![Project Modules](project_modules.png)
2328

24-
25-
Set the trackers and default subject for the notes or logs in the plugin setting of **Redmine GTT SMASH** so that the issue can be created based on the setting.
29+
Set the trackers and default subject for the notes or logs in the plugin setting
30+
of **Redmine GTT SMASH** so that the issue can be created based on the setting.
2631

2732
![GTT SMASH Setting](gtt_smash_setting.png)
2833

29-
30-
3134
## Connect SMASH mobile application to Redmine
3235

3336
### Connect Redmine account
3437

35-
In SMASH mobile application top menu go to **Export** or **Import**. Click on the gear icon of **GTT** and you will see the following:
38+
In SMASH mobile application top menu go to **Export** or **Import**. Click on
39+
the gear icon of **GTT** and you will see the following:
3640

3741
![GTT URL](import_setting.png) ![GTT URL](gtt_url.png)
3842

@@ -50,7 +54,8 @@ This will import your project's form configuration to mobile storage.
5054

5155
### Create issue
5256

53-
In the SMASH application you can create Simple Notes, Form Notes, etc. Form Notes can be exported to your Redmine project as **issue**.
57+
In the SMASH application you can create Simple Notes, Form Notes, etc. Form
58+
Notes can be exported to your Redmine project as **issue**.
5459

5560
:::caution
5661
Only *Form Notes* are currently supported in combination with Redmine GTT!
@@ -60,7 +65,8 @@ Follow these steps to upload your notes as issues or synchronize changes:
6065

6166
1. Go to top menu **Export** &#8594; **GTT**
6267
2. It will indicate if there is new data to be uploaded
63-
3. Choose a project for each note or GPS log to create the issue(s) *(unselected will be ignored)*
68+
3. Choose a project for each note or GPS log to create the issue(s)
69+
*(unselected will be ignored)*
6470
4. Click on **Upload** to export the issue(s)
6571

6672
![GTT Export](gtt_export.png)

‎init.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
author_url 'https://github.com/georepublic'
77
url 'https://github.com/gtt-project/redmine_gtt_smash'
88
description 'Adds SMASH integration capabilities for GTT projects'
9-
version '2.0.0'
9+
version '2.1.0'
1010

11-
requires_redmine :version_or_higher => '4.2.0'
11+
requires_redmine :version_or_higher => '5.0.0'
1212

1313
settings(
1414
default: {

0 commit comments

Comments
 (0)