Skip to content

Commit

Permalink
Merge pull request #22 from C2DH/fix/translations
Browse files Browse the repository at this point in the history
fix/translations
  • Loading branch information
eliselavy authored Dec 1, 2020
2 parents 51d3d1a + 9486c0f commit 079f5da
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 49 deletions.
4 changes: 2 additions & 2 deletions src/components/Auth0/LoginButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Button } from 'react-bootstrap'
const LoginButton = () => {
const { loginWithRedirect } = useAuth0();

return <Button className="nav-link" variant="outline" size='sm' onClick={() => loginWithRedirect()}>Log In</Button>;
return <Button className="nav-link" variant="outline" size='sm' onClick={() => loginWithRedirect()}>Login</Button>;
};

export default LoginButton;
export default LoginButton;
2 changes: 1 addition & 1 deletion src/components/Footer/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const Footer = () => {
<Container className="py-5">
<Row>
<Col md={{span: 3, offset:2}}>
© <a href="https://www.uni.lu/">Université du Luxembourg</a><br/> © De Gruyter {now.getFullYear()}
© <a href="https://www.uni.lu/">University of Luxembourg</a><br/> © De Gruyter {now.getFullYear()}
</Col>
<Col md={3}>
<Nav className="flex-column">
Expand Down
2 changes: 1 addition & 1 deletion src/components/Forms/FormAuthorContact.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ const FormAuthorContact = ({ onChange, onSelectAsAuthor, initialValue }) => {
onChange={(field) => handleChange({ id: 'email', ...field })}
>
<Form.Text className="text-muted">
We'll never share your email with anyone else
We'll never share your email with anyone else.
</Form.Text>
</FormGroupWrapper>
<Form.Group>
Expand Down
22 changes: 11 additions & 11 deletions src/data/mock-api/mock-about-ipynb.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
}
},
"source": [
"### Peer review and submission policy",
"### Peer Review and Submission Policy",
"The JDH is a double blind peer review journal. It publishes all kind of digital history research. Abstracts must be submitted via the journal's website before a full paper can be submitted. The *managing editor* will contact the author(s) to assess the feasibility of the authors' project.",
"Once the *managing editor's agreement* has been obtained, the article must be submitted. It will contain the three layers that make the particularity of the JDH. The three layers will be evaluated according to a double blind peer review procedure. If you have any editorial questions, you can contact the [managing editor](mailto:frederic.clavert@uni.lu)"
]
Expand All @@ -54,16 +54,16 @@
}
},
"source": [
"### The team at the C²DH",
"### The Team at the C²DH",
"The development and maintaining of the Journal relies on a team that brings together a wide range of competences (in alphabetical order):",
"[Robert Beta](https://c2dh.uni.lu/people/robert-beta), system administrator",
"[Frédéric Clavert](https://c2dh.uni.lu/people/frederic-clavert) Assistant Professor in contemporary history and JDH managing editor",
"[Ori Elisar](https://c2dh.uni.lu/people/ori-elisar), user experience designer",
"[Andreas Fickers](https://c2dh.uni.lu/people/andreas-fickers), Director of the C²DH and editor in chief for the Journal",
"[Elisabeth Guerard](https://c2dh.uni.lu/people/elisabeth-guerard), developer",
"[Daniele Guido](https://c2dh.uni.lu/people/daniele-guido), lead designer and developer",
"[Mirjam Pfeiffer](https://c2dh.uni.lu/people/mirjam-pfeiffer), user experience and user interaction designer",
"[Lars Weineke](https://c2dh.uni.lu/people/lars-wieneke), Head of Digital Research infrastructure"
"[Robert Beta](https://c2dh.uni.lu/people/robert-beta): System Administrator",
"[Frédéric Clavert](https://c2dh.uni.lu/people/frederic-clavert): Assistant Professor in Contemporary History and JDH Managing Editor",
"[Ori Elisar](https://c2dh.uni.lu/people/ori-elisar): User Experience Designer",
"[Andreas Fickers](https://c2dh.uni.lu/people/andreas-fickers): Director of the C²DH and Editor in Chief for the Journal",
"[Elisabeth Guerard](https://c2dh.uni.lu/people/elisabeth-guerard): Developer",
"[Daniele Guido](https://c2dh.uni.lu/people/daniele-guido): Lead Designer and Developer",
"[Mirjam Pfeiffer](https://c2dh.uni.lu/people/mirjam-pfeiffer): User Experience and User Interaction Designer",
"[Lars Wieneke](https://c2dh.uni.lu/people/lars-wieneke): Head of Digital Research Infrastructure"
]
},
{
Expand All @@ -74,7 +74,7 @@
}
},
"source": [
"### The team at De Gruyter"
"### The Team at De Gruyter"
]
}
]
Expand Down
2 changes: 1 addition & 1 deletion src/data/mock-api/mock-home-ipynb.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
},
"source": [
"### Looking for Early Bird Contributors",
"The first issue of the Journal of Digital History will not target any particular topic: contributions from all subfields of (digital) history are welcome! We will rather seek articles which structure and argument will demonstrate the interest of our approach, based on the interconnection of the narrative, hermeneutics and data layers."
"The first issue of the Journal of Digital History will not target any particular topic: contributions from all subfields of (digital) history are welcome! We will rather seek articles which structure and argument will demonstrate the interest of our approach, based on the interconnection of the narrative, hermeneutics and data layer."
]
},
{
Expand Down
20 changes: 9 additions & 11 deletions src/data/mock-api/mock-terms-of-use-ipynb.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"source": [
"### Legal Notice",
"Consultation of this site is subject to the terms and conditions set out below. By consulting the pages of this site, you agree to respect these terms and conditions.",
"Site editor and contact: Luxembourg Centre for Contemporary and Digital History (C²DH) – Université du Luxembourg – 2, avenue de l’Université L-4365 Esch-sur-Alzette (Luxembourg) Tel.: (+352) 46 66 44 1 Email: c2dh@uni.lu.",
"Site editor and contact: Luxembourg Centre for Contemporary and Digital History (C²DH) – University of Luxembourg – 2, avenue de l’Université L-4365 Esch-sur-Alzette (Luxembourg) Tel.: (+352) 46 66 44 1 Email: c2dh@uni.lu.",
"This site is hosted by the University of Luxembourg.",

"#### **General Terms and Conditions of Use**",
Expand All @@ -41,7 +41,7 @@
"The University of Luxembourg reserves the right to correct the content of this website at any time and without notice.",
"The University of Luxembourg undertakes all efforts to offer available and verified information and/or resources to users, but cannot be held responsible for errors, a lack of availability or invalid character of the information.",
"Under no circumstances can the information contained on this website constitute a warranty in the case of administrative or educational errors. For further information, directly contact the secretariats concerned of the University of Luxembourg.",
"Any user who discovers inaccuracies, erroneous information or information of a clearly unlawful nature is invited to inform Luxembourg Centre for Contemporary and Digital History (C²DH) – Université du Luxembourg at the above mentioned address.",
"Any user who discovers inaccuracies, erroneous information or information of a clearly unlawful nature is invited to inform Luxembourg Centre for Contemporary and Digital History (C²DH) – University of Luxembourg at the above mentioned address.",

"#### **Policy Regarding Links**",
"Links to external websites or other sources do not constitute a recommendation or guarantee on the part of the C²DH regarding their content, which remains the exclusive responsibility of their authors. The C²DH is happy to authorise any website (source site) to insert, for non-commercial purposes, a hyperlink to the site https://journalofdigitalhistory.org or to one of its inner pages (sites or target pages), provided that:",
Expand All @@ -60,29 +60,27 @@
"The General Terms of Use set out the basic rules to be observed when using social networks. Abiding by the law and respecting good social practices are the fundamental elements of these rules. These terms of use are to be considered as supplementary to the terms of use set out by each of the media used: Facebook, Twitter, Youtube, etc.",

"#### **Data Protection**",
"The C2DH of the University of Luxembourg processes your personal data in the context of our relationship with you as a user of the website. The personal data we process are your name, surname and email address, so that we can answer your questions. This processing of your data is based on your consent (Article 6(1) of the General Data Protection Regulation 2016/697, hereinafter “GDPR”). You can withdraw your consent at any time by sending a message to c2dh@uni.lu. Your personal data will be processed by the internal, responsible departments of C²DH and will not be passed on to third parties. Your data will be stored for one year from the moment you fill in the form. You have the right to access, correct and delete personal data concerning you. You can exercise this right by filling in the form available on the uni.lu site at the following link. The University's Data Protection Officer is available during office hours to answer all questions and queries relating to the processing of your personal data. You can send him an e-mail to dpo@uni.lu. If you believe that the processing of your data violates the regulation on the protection of personal data, you can lodge a complaint with the CNPD by visiting its site cnpd.lu.",
"The C2DH of the University of Luxembourg processes your personal data in the context of our relationship with you as a user of the website. The personal data we process are your name, surname and email address, so that we can answer your questions. This processing of your data is based on your consent (Article 6(1) of the General Data Protection Regulation 2016/697, hereinafter “GDPR”). You can withdraw your consent at any time by sending a message to c2dh@uni.lu. Your personal data will be processed by the internal, responsible departments of C²DH and will not be passed on to third parties. Your data will be stored for one year from the moment you fill in the form. You have a right to access, rectify, erase, object to or restrict the processing related to your personal data. You can exercise your rights by following the procedure described as on the Data Protection page **https://wwwfr.uni.lu/universite/data_protection/your_rights** of the University website. The University's Data Protection Officer is available during office hours to answer all questions and queries relating to the processing of your personal data. You can send him an email via dpo@uni.lu. If you believe that the processing of your data violates the regulation on the protection of personal data, you can lodge a complaint with the CNPD by visiting its site cnpd.lu.",

"This site uses Google Analytics, a website analysis service provided by Google Inc. (“Google”). Google Analytics uses cookies, which are text files placed on your computer, to help the website analyse how users use the site. The information generated by the cookies about your use of the website (including your IP address) will be transmitted to and stored by Google on servers in the United States. Google will use this information for the purpose of analysing your use of the website, compiling reports on website activity for the website operator and providing other services relating to the use of the website and the Internet. Google may also transmit this information to third parties where required to do so by law, or where such third parties process the information on behalf of Google, including in particular the operator of this website. Google will not associate your IP address with any other data held by Google. You can disable cookies by selecting the appropriate settings on your browser. However, disabling cookies may prevent the use of certain functionalities of the website. By using this website, you explicitly consent to the processing of your data by Google in the manner and for the purposes set out above.",
"For a general overview of some of the ways this website processes your personal data including the use of cookies, please refer to our Privacy notice.",
"For a general overview of some of the ways this website processes your personal data including the use of cookies, please refer to our Privacy Policy notice. **https://policies.google.com/privacy**",

"### COPYRIGHT",
"The site, together with the information and works that it contains (texts, logos, images, photographs, documents, exhibition design and presentation, etc.), is protected by intellectual property laws and by copyright legislation in all countries. You undertake to respect these intellectual property regulations and the copyright usage restrictions provided with each document without prejudice to the rights and exceptions envisaged by any binding provisions of applicable law.",
"### Copyright",
"The site, together with the information and works that it contains (texts, logos, images, photographs, documents, exhibition design and presentation, data, etc.), is protected by intellectual property laws and by copyright legislation in all countries. You undertake to respect these intellectual property regulations and the copyright usage restrictions provided with each document without prejudice to the rights and exceptions envisaged by any binding provisions of applicable law.",
"The works available on this site are the exclusive property of the University of Luxembourg and/or of their authors or right holders. The University of Luxembourg, acting through its Luxembourg Centre for Contemporary and Digital History (hereinafter “C²DH”) makes the works available on this site for the sole purposes of allowing the fruition of the website.",
"Unless otherwise indicated for each specific work, all rights of reproduction, public communication, adaptation, distribution or rebroadcasting via the Internet, an intranet or any other digital or analogic means are strictly reserved in all countries.",
"In particular, you undertake not to remove or alter the copyright notice indicating the author or the source of a document, nor to circumvent the digital rights management protection of the works, such as restrictions on printing or downloading and visible or invisible watermarking.",
"The photographs and personal documents available on the site may also be subject to the exclusive rights held by the persons photographed or by the owners of the aforementioned documents, all use being consequently subject to their prior authorisation.",
"Any infringement may give rise to civil or criminal proceedings.",
"Requests for authorisation should be sent to the C²DH at the address indicated hereafter, or to the authors or right holders concerned.",
"",
"Luxembourg Centre for Contemporary and Digital History (C²DH) – Université du Luxembourg – 2, avenue de l’Université L-4365 Esch-sur-Alzette (LUXEMBOURG) Tel.: (+352) 46 66 44 1 Email : c2dh@uni.lu.",
"Luxembourg Centre for Contemporary and Digital History (C²DH) – University of Luxembourg – 2, avenue de l’Université L-4365 Esch-sur-Alzette (Luxembourg) Tel.: (+352) 46 66 44 1 Email: c2dh@uni.lu.",

"The official works are authentic solely in their original version, which may be consulted by contacting their author/publisher.",

"Content provided by the C²DH is not necessarily comprehensive, exhaustive, accurate or up to date. If, despite our best efforts, errors were to be found, the C²DH may not be held responsible. The C²DH would nevertheless appreciate being informed of any such errors.",

"### PERMITTED USE",

"Short quotations are permitted, including for information and journalism purposes but excluding any commercial purposes, provided that the name of the author of the quoted document and its source are cited : ",
"### Permitted Use",
"Short quotations are permitted, including for information and journalism purposes but excluding any commercial purposes, provided that the name of the author of the quoted document and its source are cited: ",
"> “University of Luxembourg, Luxembourg Centre for Contemporary and Digital History (C²DH) - Journal of Digital History https://journalofdigitalhistory.org”.",
"Users are solely responsible for their use of material provided on the site."
]
Expand Down
4 changes: 2 additions & 2 deletions src/pages/AbstractSubmission.js
Original file line number Diff line number Diff line change
Expand Up @@ -168,14 +168,14 @@ const AbstractSubmission = (props) => {
<Col md={{span: 6, offset:2}}>
<h1 className="my-5">{t('pages.abstractSubmission.title')}</h1>
<Jumbotron className="pt-4 pb-2 px-4">
<h3>First issue call for papers</h3>
<h3>First Issue Call for Papers</h3>
<p>
The first issue of the <em>Journal of Digital History</em> will not target any particular topic:
contributions from all subfields of (digital) history are welcome!
<br />
We will rather seek articles which structure and argument will
demonstrate the interest of our approach, based on the interconnexion
of the narrative, hermeneutics and data layers.
of the narrative, hermeneutics and data layer.
</p>
</Jumbotron>
</Col>
Expand Down
Loading

0 comments on commit 079f5da

Please sign in to comment.