Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Genesys PGR
Genesys Website
Commits
260ebb08
Commit
260ebb08
authored
Nov 01, 2018
by
Matija Obreza
Browse files
Use correct ISO code
parent
9d203c2e
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/geo/routes.ts
View file @
260ebb08
...
...
@@ -17,12 +17,12 @@ const publicRoutes = [
exact
:
true
,
},
{
path
:
'
/iso3
3
16/:isoCode
'
,
path
:
'
/iso31
6
6/:isoCode
'
,
component
:
CountryDisplayPage
,
exact
:
true
,
},
{
path
:
'
/iso3
3
16/
'
,
path
:
'
/iso31
6
6/
'
,
component
:
CountryListPage
,
exact
:
true
,
},
...
...
src/geo/translations.json
View file @
260ebb08
...
...
@@ -2,7 +2,7 @@
"public"
:
{
"p"
:
{
"countryList"
:
{
"title"
:
"ISO-3
3
16 list"
,
"title"
:
"ISO-31
6
6 list"
,
"subTitle"
:
"Find registered institutes as well as overview on plant genetic resources"
,
"acceCount"
:
"{{count, number}} accessions"
,
"acceCountAtInstitutes"
:
"{{count, number}} accessions at {{institutes, number}} institutes"
,
...
...
@@ -10,8 +10,8 @@
"institutesCountInWIEWS"
:
"{{count, number}} institutes registered in WIEWS"
,
"instituteLocations"
:
"Institute locations"
,
"moreInformation"
:
"More information"
,
"isoCodes"
:
"ISO-3
3
16"
,
"countryProfile"
:
"ISO-3
3
16 code {{code}}"
"isoCodes"
:
"ISO-31
6
6"
,
"countryProfile"
:
"ISO-31
6
6 code {{code}}"
},
"regionList"
:
{
"title"
:
"FAO Geographical regions"
,
...
...
@@ -31,6 +31,6 @@
"longitude"
:
"Longitude"
,
"address"
:
"Address"
,
"country"
:
"Country"
,
"menu"
:
"ISO-3
3
16 codes"
"menu"
:
"ISO-31
6
6 codes"
}
}
src/geo/ui/RegionDisplayPage.tsx
View file @
260ebb08
...
...
@@ -69,7 +69,7 @@ class RegionDisplayPage extends React.Component<IRegionDisplayPageProps> {
<
ContentHeaderWithButton
title
=
{
`
${
details
.
countries
.
length
>
0
?
t
(
`geo.public.p.regionList.listOfCountries`
)
:
t
(
`geo.public.p.regionList.listOfSubRegions`
)
}
`
}
buttons
=
{
<
span
>
<
ActionButton
action
=
{
()
=>
navigateTo
(
'
/geo/regions
'
)
}
title
=
{
t
(
`geo.public.p.regionList.b.listAllFaoRegions`
)
}
/>
{
details
.
parentRegion
&&
<
ActionButton
action
=
{
()
=>
navigateTo
(
`/iso3
3
16/region/
${
details
.
parentRegion
.
isoCode
}
`
)
}
title
=
{
`
${
t
(
`geo.public.p.regionList.b.showParentRegion`
,
{
what
:
details
.
parentRegion
.
name
})
}
`
}
/>
}
{
details
.
parentRegion
&&
<
ActionButton
action
=
{
()
=>
navigateTo
(
`/iso31
6
6/region/
${
details
.
parentRegion
.
isoCode
}
`
)
}
title
=
{
`
${
t
(
`geo.public.p.regionList.b.showParentRegion`
,
{
what
:
details
.
parentRegion
.
name
})
}
`
}
/>
}
</
span
>
}
/>
...
...
src/ui/genesys/Links.tsx
View file @
260ebb08
...
...
@@ -91,7 +91,7 @@ const CountryLink = ({ country, noflag, children }: { country: Country, noflag?:
return
null
;
}
return
(
<
Link
to
=
{
`/iso3
3
16/
${
country
.
code3
}
`
}
>
<
Link
to
=
{
`/iso31
6
6/
${
country
.
code3
}
`
}
>
<
div
style
=
{
{
display
:
'
flex
'
,
alignItems
:
'
center
'
}
}
>
{
!
noflag
&&
<
img
src
=
{
`images/flags/
${
country
.
code3
}
.png`
}
style
=
{
{
maxWidth
:
'
1.25rem
'
,
padding
:
'
0 0.25rem
'
}
}
/>
}
{
children
||
country
.
name
}
...
...
@@ -105,7 +105,7 @@ const RegionLink = ({ region, children }: { region: GeoRegion, children?: any })
return
null
;
}
return
(
<
Link
to
=
{
`/iso3
3
16/region/
${
region
.
isoCode
}
`
}
>
<
Link
to
=
{
`/iso31
6
6/region/
${
region
.
isoCode
}
`
}
>
{
children
||
region
.
name
}
</
Link
>
);
...
...
src/ui/layout/Header/LeftMenu.tsx
View file @
260ebb08
...
...
@@ -120,7 +120,7 @@ class LeftMenu extends React.Component<ILeftMenuProps, any> {
<
NavLink
activeClassName
=
"active"
to
=
"/subsets"
>
{
t
(
'
subsets.common.modelName_plural
'
)
}
</
NavLink
>
</
ListItem
>
<
ListItem
button
>
<
NavLink
activeClassName
=
"active"
to
=
"/iso3
3
16"
>
{
t
(
'
geo.common.menu
'
)
}
</
NavLink
>
<
NavLink
activeClassName
=
"active"
to
=
"/iso31
6
6"
>
{
t
(
'
geo.common.menu
'
)
}
</
NavLink
>
</
ListItem
>
<
ListItem
button
>
<
NavLink
activeClassName
=
"active"
to
=
"/wiews"
>
{
t
(
'
institutes.common.modelName_plural
'
)
}
</
NavLink
>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment