Merge from stable to master: v0.9.0-rc1

Merge pull request #104 from CSCfi/stable
CSCfi · Aug 22, 2018 · 38fcf12 · 38fcf12
2 parents 20af488 + 5972ce0
commit 38fcf12
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/etsin_finder/frontend/js/components/dataset/sidebar/citation.jsx b/etsin_finder/frontend/js/components/dataset/sidebar/citation.jsx
@@ -10,7 +10,7 @@ export default class Citation extends Component {
     this.state = {
       creators: Data.research_dataset.creator && Data.research_dataset.creator,
       contributors: Data.research_dataset.contributor && Data.research_dataset.contributor,
-      publisher: Data.data_catalog.catalog_json.publisher.name,
+      publisher: Data.research_dataset.publisher && Data.research_dataset.publisher.name,
       release_date: Data.research_dataset.modified,
       title: Data.research_dataset.title,
       pid: Data.research_dataset.preferred_identifier,
@@ -50,7 +50,9 @@ export default class Citation extends Component {
           </Fragment>
         ))}
         <span title="Title">{checkDataLang(this.state.title)}, </span>
-        <span title="Publisher">{checkDataLang(this.state.publisher)}, </span>
+        {this.state.publisher &&
+          <span title="Publisher">{checkDataLang(this.state.publisher)}, </span>
+        }
         <span title="Release date">{this.state.release_date}, </span>
         <span title="Preferred identifier">{this.state.pid}</span>
       </Fragment>

diff --git a/etsin_finder/frontend/js/components/errorpage/index.jsx b/etsin_finder/frontend/js/components/errorpage/index.jsx
@@ -26,7 +26,7 @@ export default class ErrorPage extends React.Component {
       <HeroBanner className="hero-primary hero-full">
         <div className="container text-center" aria-live="polite">
           {this.props.error.type === 'notfound' && (
-            <Translate content="error.notFound" component="h1" />
+            <Translate content="error.notLoaded" component="h1" />
           )}
           {this.props.error.type === 'error' && (
             <Translate content="error.notLoaded" component="h1" />

diff --git a/etsin_finder/frontend/locale/english.js b/etsin_finder/frontend/locale/english.js
@@ -130,7 +130,7 @@ const english = {
   error: {
     notFound:
       'Sorry, we are having some technical difficulties at the moment. Please, try again later.',
-    notLoaded: "Sorry! Page couldn't be found.",
+    notLoaded: "Sorry! The page couldn't be found.",
   },
   general: {
     showMore: 'Show more',

diff --git a/etsin_finder/frontend/locale/finnish.js b/etsin_finder/frontend/locale/finnish.js
@@ -129,7 +129,7 @@ const finnish = {
   error: {
     notFound:
       'Olemme pahoillamme, nyt sattui häiriötilanne. Ole hyvä ja yritä hetken päästä uudelleen.',
-    notLoaded: 'Hups! Sivua ei löytynyt!',
+    notLoaded: 'Hups! Sivua ei löytynyt.',
   },
   general: {
     showMore: 'Näytä lisää',