Merge pull request #117 from montestat/develop

merge

Author: nikolabul

.github/workflows/deploy-to-production.yml

@@ -35,10 +35,10 @@ jobs:
       with:
         fetch-depth: 0
         persist-credentials: false
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v1
+    - name: Set up Python 3.8
+      uses: actions/setup-python@v2
       with:
-        python-version: 3.7
+        python-version: 3.8
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

.github/workflows/deploy-to-staging.yml

@@ -29,10 +29,10 @@ jobs:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 0
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v1
+    - name: Set up Python 3.8
+      uses: actions/setup-python@v2
       with:
-        python-version: 3.7
+        python-version: 3.8
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

.github/workflows/test-pull-requests.yml

@@ -9,10 +9,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v1
+    - name: Set up Python 3.8
+      uses: actions/setup-python@v2
       with:
-        python-version: 3.7
+        python-version: 3.8
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

data/indicator_1-3-1-N.csv data/indicator_1-3-1.csv

@@ -3,11 +3,11 @@ data_non_statistical: false
 data_show_map: false
 data_start_values: []
 expected_disaggregations: []
-graph_title: global_indicators.1-3-1-N-title
+graph_title: global_indicators.1-3-1-title
 graph_titles: []
 graph_type: bar
-indicator_name: global_indicators.1-3-1-N-title
-indicator_number: '1.3.1.N'
+indicator_name: global_indicators.1-3-1-title
+indicator_number: '1.3.1'
 national_geographical_coverage: custom.country_name
 precision:
   - unit: percentage

indicator-config/1-3-1.yml

@@ -3,11 +3,11 @@ data_non_statistical: false
 data_show_map: false
 data_start_values: []
 expected_disaggregations: []
-graph_title: global_indicators.2-4-1-N-title
+graph_title: global_indicators.2-4-1-n-title
 graph_titles: []
 graph_type: bar
-indicator_name: global_indicators.2-4-1-N-title
-indicator_number: '2.4.1.N'
+indicator_name: global_indicators.2-4-1-n-title
+indicator_number: '2.4.1.n'
 national_geographical_coverage: custom.country_name
 reporting_status: complete
 standalone: false

indicator-config/2-4-1-a.yml indicator-config/2-4-1-n.yml

@@ -1,10 +1,10 @@
 SDG_GOAL__GLOBAL: global_goals.1-title
 SDG_TARGET__GLOBAL: global_targets.1-3-title
-SDG_INDICATOR__GLOBAL: global_indicators.1-3-1-N-title
+SDG_INDICATOR__GLOBAL: global_indicators.1-3-1-title
 methodology_global: ''
 SDG_GOAL: global_goals.1-title
 SDG_TARGET: global_targets.1-3-title
-SDG_INDICATOR: global_indicators.1-3-1-N-title
+SDG_INDICATOR: global_indicators.1-3-1-title
 methodology_national: ''
 DATA_SOURCE: 'UNECE: https://w3.unece.org/SDG/'
 COVERAGE: ''

meta/1-3-1.yml

@@ -1,10 +1,10 @@
 SDG_GOAL__GLOBAL: global_goals.2-title
 SDG_TARGET__GLOBAL: global_targets.2-4-title
-SDG_INDICATOR__GLOBAL: global_indicators.2-4-1-N-title
-methodology_global: metadata_texts.2-4-1-N-global-methodology
+SDG_INDICATOR__GLOBAL: global_indicators.2-4-1-n-title
+methodology_global: metadata_texts.2-4-1-n-global-methodology
 SDG_GOAL: global_goals.2-title
 SDG_TARGET: global_targets.2-4-title
-SDG_INDICATOR: global_indicators.2-4-1-N-title
+SDG_INDICATOR: global_indicators.2-4-1-n-title
 methodology_national: ''
 DATA_SOURCE: ''
 COVERAGE: ''

meta/2-4-1-a.yml meta/2-4-1-n.yml

@@ -147,7 +147,7 @@
 2-3-1-title: Obim proizvodnje po radnoj jedinici po klasama veličine poljoprivrednih/stočarskih/šumarskih preduzeća
 2-3-2-title: Prosječni prihod malih proizvođača hrane, po polu i autohtonom statusu
 2-4-1-title: Udio poljoprivrednih površina koje se koriste za produktivnu i održivu poljoprivredu
-2-4-1-N-title: Udio poljoprivrednih površina koje se koriste za produktivnu i održivu poljoprivredu
+2-4-1-n-title: Udio poljoprivrednih površina koje se koriste za produktivnu i održivu poljoprivredu
 2-5-1-title: Broj biljnih i životinjskih genetskih resursa za hranu i poljoprivredu osiguran u objektima za očuvanje na srednji ili na dugi rok
 2-5-2-title: Udio lokalnih sorti/pasmina, klasifikovanih kao pod rizikom, nije pod rizikom ili nepoznat nivo rizika od istrebljenja
 2-a-1-title: Indeks usmjerenosti na poljoprivredu za budžetske rashode

translations/cnr/global_indicators.yml

@@ -5,7 +5,7 @@
   definicijama'
 1-3-title: 'Sprovesti nacionalno odgovarajuće sisteme i mjere socijalne zaštite, uključujući
   osnovni skup prava iz te oblasti, i do 2030. postići značajnu pokrivenost siromašnih
-  i ugriženih'
+  i ugroženih'
 1-4-title: 'Obezbijediti do 2030. godine da svi muškarci i žene, a posebno siromašni
   i nezaštićeni, imaju jednaka prava na ekonomske resurse, kao i pristup osnovnim uslugama,
   vlasništvu i kontroli nad zemljištem i drugim oblicima vlasništva, nasljedstvu,

translations/cnr/global_targets.yml

@@ -147,7 +147,7 @@
 2-3-1-title: Volume of production per labour unit by classes of farming/pastoral/forestry enterprise size
 2-3-2-title: Average income of small-scale food producers, by sex and indigenous status
 2-4-1-title: Proportion of agricultural area under productive and sustainable agriculture
-2-4-1-N-title: Proportion of agricultural area under productive and sustainable agriculture
+2-4-1-n-title: Proportion of agricultural area under productive and sustainable agriculture
 2-5-1-title: Number of (a) plant and (b) animal genetic resources for food and agriculture secured in either medium- or long-term conservation facilities
 2-5-2-title: Proportion of local breeds classified as being at risk of extinction
 2-a-1-title: The agriculture orientation index for government expenditures