Skip to content

Commit

Permalink
Frontpage news section translated
Browse files Browse the repository at this point in the history
  • Loading branch information
TomNuorivaara-Solita authored and teemu-solita committed Mar 8, 2018
1 parent feb63ce commit f2a8234
Show file tree
Hide file tree
Showing 12 changed files with 92 additions and 25 deletions.
11 changes: 10 additions & 1 deletion _config_dev.yml
Expand Up @@ -152,15 +152,24 @@ t:
api-status:
en: "API status"
fi: "Rajapintojen tila"
url:
en: "/en/api-status"
fi: "/rajapintojen-tila"
frontpage-heading:
en: "Digitraffic"
fi: "Digitraffic"
frontpage-intro:
en: "Information about open data for application development from Finnish road, railway and maritime traffic."
fi: "Ajantasaista avointa liikennetietoa sovelluskehitykseen Suomen tie-, rautatie- ja vesiliikenteestä."
latest-posts:
en: "Latest posts"
fi: "Ajankohtaista"
loading:
en: "Loading"
fi: "Ladataan"
news:
en: "News"
fi: "Tiedotteet"
service-introduction:
en: "Service introduction"
fi: "Palvelun esittely"
Expand Down Expand Up @@ -193,7 +202,7 @@ t:
en: "Year"
fi: "Vuosi"

# For javascript
# For javascript // Use camelCasing in naming
js:
loadingError:
en: "Error in loading data"
Expand Down
1 change: 1 addition & 0 deletions _includes/breadcrumb-home.html
@@ -0,0 +1 @@
<span class="breadcrumb__item"><a class="link" href="{% include url-home.html %}">Digitraffic</a></span>
2 changes: 1 addition & 1 deletion _includes/posts-in-category.html
Expand Up @@ -24,7 +24,7 @@ <h3 class="h3 posts-in-category__post-heading"><a href="{{ post.url | prepend:si
--></span><!--
--><ul class="date-type-tags__type-list"><!--
-->{% for traffictype in post.traffictypes %}<!--
--><li class="date-type-tags__type"><a class="link" href="{{ "/" | prepend:site.baseurl }}{{ category[0] | downcase }}?traffictype={{ traffictype | downcase }}">{% assign traffictype_l = traffictype | downcase %}{{ site.t[traffictype_l][page.lang] }}</a></li><!--
--><li class="date-type-tags__type"><a class="link" href="{{ "/" | prepend:site.baseurl }}{{ category[0] | downcase }}?traffictype={{ traffictype | downcase }}">{% assign traffictype_dc = traffictype | downcase %}{{ site.t[traffictype_dc][page.lang] }}</a></li><!--
-->{% endfor %}<!--
--></ul><!--
--><ul class="date-type-tags__tag-list"><!--
Expand Down
1 change: 1 addition & 0 deletions _includes/url-home.html
@@ -0,0 +1 @@
{{ "/" | prepend:site.baseurl }}{% if page.lang != "fi" %}{{ page.lang }}/{% endif %}
2 changes: 1 addition & 1 deletion _layouts/api-status.html
Expand Up @@ -31,7 +31,7 @@ <h1 class="hero-image__heading">{{ page.title }}</h1>
<!-- Breadcrumb -->
<div class="row">
<div class="col-xs-12 breadcrumb"><!--
--><span class="breadcrumb__item"><a class="link" href="{{ "/" | prepend:site.baseurl }}">Digitraffic</a></span><!--
-->{% include breadcrumb-home.html %}<!--
--><span class="breadcrumb__item">{{ page.title }}</span>
</div>
</div>
Expand Down
30 changes: 16 additions & 14 deletions _layouts/frontpage.html
Expand Up @@ -42,13 +42,13 @@ <h1 class="hero-image__heading">{{ site.t.frontpage-heading[page.lang] }}</h1>
<section id="service-status-section" class="content__frontpage-section">
<div class="row">
<div class="col-xs">
<h2 class="h2 u--centered service-status__section-header"><a href="{{ "/rajapintojen-tila" | prepend:site.baseurl }}" class="h-link">{{ site.t.apis[page.lang] }}</a></h2>
<h2 class="h2 u--centered service-status__section-header"><a href="{{ site.t.api-status.url[page.lang] | prepend:site.baseurl }}" class="h-link">{{ site.t.apis[page.lang] }}</a></h2>
</div>
</div>
<div class="row">
<div class="col-xs-12 col-sm-4">
<div class="service-status__column">
<a href="tieliikenne" class="service-status__link">
<a href="{% include url-home.html %}{{ site.t.tieliikenne[page.lang] | downcase }}" class="service-status__link">
<div class="service-status__content">
<div id="service-status-circle-road" class="service-status__icon-circle-bottom">
<div class="service-status__icon-circle">
Expand All @@ -65,7 +65,7 @@ <h4 class="h4 service-status__service-heading">{{ site.t.tieliikenne[page.lang]
</div>
<div class="col-xs-12 col-sm-4">
<div class="service-status__column">
<a href="https://rata.digitraffic.fi" class="service-status__link">
<a href="{% include url-home.html %}{{ site.t.rautatieliikenne[page.lang] | downcase }}" class="service-status__link">
<div class="service-status__content">
<div id="service-status-circle-rail" class="service-status__icon-circle-bottom">
<div class="service-status__icon-circle">
Expand All @@ -82,7 +82,7 @@ <h4 class="h4 service-status__service-heading">{{ site.t.rautatieliikenne[page.l
</div>
<div class="col-xs-12 col-sm-4">
<div class="service-status__column">
<a href="meriliikenne" class="service-status__link">
<a href="{% include url-home.html %}{{ site.t.meriliikenne[page.lang] | downcase }}" class="service-status__link">
<div class="service-status__content">
<div id="service-status-circle-marine" class="service-status__icon-circle-bottom">
<div class="service-status__icon-circle">
Expand All @@ -101,7 +101,7 @@ <h4 class="h4 service-status__service-heading">{{ site.t.meriliikenne[page.lang]
<div class="row">
<div class="col-xs-12">
<div class="service-status__button-area">
<a href="{{ "/rajapintojen-tila" | prepend:site.baseurl }}"><button class="button"><i class="button__icon material-icons md-light md-lg">show_chart</i><span class="button__text">{{ site.t.api-status[page.lang] }}</span></button></a>
<a href="{{ site.t.api-status.url[page.lang] | prepend:site.baseurl }}"><button class="button"><i class="button__icon material-icons md-light md-lg">show_chart</i><span class="button__text">{{ site.t.api-status[page.lang] }}</span></button></a>
</div>
</div>
</div>
Expand All @@ -113,34 +113,36 @@ <h4 class="h4 service-status__service-heading">{{ site.t.meriliikenne[page.lang]
<div class="row">
<div class="col-xs"><!--
-->{% if has_articles == false and has_events == false %}<!--
--><h2 class="h2 u--centered"><a href="{{ "/tiedotteet" | prepend:site.baseurl }}" class="h-link">Tiedotteet</a></h2><!--
--><h2 class="h2 u--centered"><a href="{{ "/" | prepend:site.baseurl }}{% if page.lang != "fi" %}{{ page.lang }}/{% endif %}{{ site.t.tiedotteet[page.lang] | downcase }}" class="h-link">{{ site.t.news[page.lang] }}</a></h2><!--
-->{% else %}<!--
--><h2 class="h2 u--centered">Ajankohtaista</h2><!--
--><h2 class="h2 u--centered">{{ site.t.latest-posts[page.lang] }}</h2><!--
-->{% endif %}
</div>
</div>
<div class="row">
{% for post in site.posts limit:3 %}
{% assign posts = site.posts | where:"lang",page.lang %}
{% for post in posts limit:3 %}
<div class="col-xs-12 col-sm-4 latest-item">
<h4 class="h4 latest-item__header-text"><a href="{{ post.url | prepend:site.baseurl }}" class="latest-item__header-link">{{ post.title }}</a></h4>
<div class="latest-item__meta-first">
<!-- White spaces commented -->
{% for category in post.categories %}<!--
-->{% assign post_category = category %}<!--
-->{% assign post_category = category | downcase %}<!--
-->{% endfor %}<!--
--><span class="latest-item__timestamp"><!--
--><i class="material-icons md-md date-type-tags__date-icon"><!--
-->{% if post_category == 'Tiedotteet' or post_category == 'Artikkelit' %}create{% endif %}<!--
-->{% if post_category == 'Tapahtumat' %}event{% endif %}<!--
-->{% if post_category == 'tiedotteet' or post_category == 'artikkelit' %}create{% endif %}<!--
-->{% if post_category == 'tapahtumat' %}event{% endif %}<!--
--></i><!--
-->{{ post.date | date: "%d.%m.%Y" }}<!--
-->{% if page.lang == "en" %}{{ post.date | date: "%-m/%-d/%Y" }}{% else %}{{ post.date | date: "%-d.%-m.%Y" }}{% endif %}<!--
--></span><!--
--><ul class="latest-item__content-type-list"><!--
--><li class="latest-item__content-type"><a href="{{ "/" | prepend:site.baseurl }}{{ post_category | downcase}}" class="link">{{ post_category }}</a></li><!--
--><li class="latest-item__content-type"><a href="{{ "/" | prepend:site.baseurl }}{{ post_category | downcase}}" class="link">{{ site.t[post_category][page.lang] }}</a></li><!--
--></ul><!--
--><ul class="latest-item__traffic-type-list"><!--
-->{% for traffictype in post.traffictypes %}<!--
--><span class="latest-item__traffic-type"><a href="{{ "/" | prepend:site.baseurl }}{{ post_category | downcase }}?traffictype={{ traffictype | downcase }}" class="latest-item__traffic-type-link link">{{ traffictype }}</a></span><!--
-->{% assign traffictype_dc = traffictype | downcase %}<!--
--><span class="latest-item__traffic-type"><a href="{{ "/" | prepend:site.baseurl }}{{ post_category | downcase }}?traffictype={{ traffictype | downcase }}" class="latest-item__traffic-type-link link">{{ site.t[traffictype_dc][page.lang] }}</a></span><!--
-->{% endfor %}<!--
--></ul>
<!-- /White spaces commented -->
Expand Down
4 changes: 2 additions & 2 deletions _layouts/news.html
Expand Up @@ -10,7 +10,7 @@
{% include head.html %}

<!--HTML body-->
<body class="body" lang="fi">
<body class="body" lang="{{ page.lang }}">

<!--Header-->
{% include header.html %}
Expand All @@ -21,7 +21,7 @@
<!--Breadcrumb-->
<div class="row">
<div class="col-xs-12 breadcrumb"><!--
--><span class="breadcrumb__item"><a class="link" href="{{ "/" | prepend:site.baseurl }}">Digitraffic</a></span><!--
-->{% include breadcrumb-home.html %}<!--
-->{% assign category = page.categories[0] | downcase %}<span class="breadcrumb__item"><a class="link" href="{{ "/" | prepend:site.baseurl }}{% if page.lang == "fi" %}{% else %}{{ page.lang }}/{% endif %}{{ site.t[category][page.lang] | downcase }}">{{ site.t[category][page.lang] }}</a></span><!--
--><span class="breadcrumb__item">{{ page.title }}</span>
</div>
Expand Down
6 changes: 3 additions & 3 deletions _layouts/posts.html
Expand Up @@ -3,12 +3,12 @@
---

<!DOCTYPE html>
<html>
<html lang="{{ page.lang }}">
<!--HTML head-->
{% include head.html %}

<!--HTML body-->
<body class="body" lang="fi">
<body class="body">

<!--Header-->
{% include header.html %}
Expand All @@ -19,7 +19,7 @@
<!--Breadcrumb-->
<div class="row">
<div class="col-xs-12 breadcrumb"><!--
--><span class="breadcrumb__item"><a class="link" href="{{ "/" | prepend:site.baseurl }}">Digitraffic</a></span><!--
-->{% include breadcrumb-home.html %}<!--
--><span class="breadcrumb__item">{{ page.title }}</span>
</div>
</div>
Expand Down
@@ -1,14 +1,16 @@
---
title: 'Tuotannon sovellukset päivitetty 28.11.2017 10:20 - 10:30'
title: 'Production applications updated 28.11.2017 10:20 - 10:30'
lang: en
ref: 2017-11-28-release
image:
published: true
categories: Tiedotteet
traffictypes:
- Tieliikenne
- Meriliikenne
tags:
- Rajapinnat
- Ylläpito
- APIs
- Admin
---

Päivitimme Digitraffic-sovelluksia tuotantoympäristön.
Expand Down
26 changes: 26 additions & 0 deletions _posts/2017-11-28-release-fi.md
@@ -0,0 +1,26 @@
---
title: 'Tuotannon sovellukset päivitetty 28.11.2017 10:20 - 10:30'
lang: fi
ref: 2017-11-28-release
image:
published: true
categories: Tiedotteet
traffictypes:
- Tieliikenne
- Meriliikenne
tags:
- Rajapinnat
- Ylläpito
---

Production applications have been updated.

Changelog:

MARITIME
- DPO-319 - Differing datasource specifications in AIS and METADATA projects
- DPO-329 - OracleDatasource initialization fix
ROAD
- DPO-363 - OPERATIONS: Image read timeout value increased

We apologize for any inconvenience.
24 changes: 24 additions & 0 deletions _posts/2018-01-09-release-en.md
@@ -0,0 +1,24 @@
---
title: 'Production applications updated 9.1.2018 10:05 - 10:54'
lang: en
ref: 2018-01-09-release
image:
published: true
categories: Tiedotteet
traffictypes:
- Tieliikenne
tags:
- APIs
- Admin
---

Digitraffic production applications have been updated.

Changelog:

ROAD
- DPO-336 - LAM binary data stream split in two in LOTJU version 2.5
- Does not effect the data format. Station real-time data is now more recent.
- DPO-399 - CameraStationsStatusMetadataUpdateJob does not handle obsolete data correctly

We apologize for any inconvenience.
@@ -1,5 +1,7 @@
---
title: 'Tuotannon sovellukset päivitetty 9.1.2018 10:05 - 10:54'
lang: fi
ref: 2018-01-09-release
image:
published: true
categories: Tiedotteet
Expand Down

0 comments on commit f2a8234

Please sign in to comment.