Commit b64d7d5f authored by Sébastiaan Versteeg's avatar Sébastiaan Versteeg
Browse files

Merge branch 'fix/locale-namespaces' into 'master'

Update locale namespaces to the new component naming convention

See merge request !204
parents 1f74cccc d32f308c
......@@ -20,29 +20,29 @@ Object {
"components/standardHeader/StandardHeader": Object {
"Calendar": "Agenda",
"Event": "Evenement",
"Notifications": "Meldingen",
"Pizza": "Pizza",
"Profile": "Profiel",
"Registration": "Registratie",
"Settings": "Instellingen",
"Welcome": "Welkom",
},
"screens/events/Calendar": Object {
"No events found!": "Geen evenementen gevonden!",
"Sorry, we couldn't load any data.": "Sorry, we konden geen gegevens laden.",
"day": "dag",
},
"screens/events/CalendarItem": Object {
"From": "Tot",
"Until": "Van",
},
"screens/events/Event": Object {
"screens/events/CalendarScreen": Object {
"No events found!": "Geen evenementen gevonden!",
"Sorry, we couldn't load any data.": "Sorry, we konden geen gegevens laden.",
"day": "dag",
},
"screens/events/EventScreen": Object {
", that you understand them and that you agree to be bound by them.": "hebt gelezen, dat je ze begrijpt en dat je accepteert eraan gebonden te zijn.",
"Are you sure you want to cancel your registration?": "Weet je je zeker dat je je wilt afmelden?",
"By registering, you confirm that you have read the": "Door te registreren, bevestig je dat je de",
"Cancel registration": "Afmelden",
"Cancel registration?": "Afmelden?",
"Cancellation deadline": "Afmelddeadline",
"Cancellation isn't possible anymore without having to pay the full costs of €{{fine}}. Also note that you will be unable to re-register.": "Afmelden is niet meer mogelijk zonder de volledige kosten van €{{fine}} te betalen. Let op: je kunt je hierna niet meer aanmelden. ",
"Could not load the event...": "Kan het evenement niet laden...",
"From": "Van",
"Location": "Locatie",
......@@ -69,19 +69,26 @@ Object {
"registrations": "aanmeldingen",
"terms and conditions": "voorwaarden",
},
"screens/events/Registration": Object {
"screens/events/RegistrationScreen": Object {
"Save": "Aanpassen",
"Sorry! We couldn't load any data.": "Sorry! We konden geen gegevens laden.",
"This field is required and must be an integer.": "Dit veld is verplicht en moet een getal zijn.",
"This field is required.": "Dit veld is verplicht.",
},
"screens/memberList/MemberList": Object {
"screens/login/LoginScreen": Object {
"Become a member": "Lid worden",
"Forgot password?": "Wachtwoord vergeten?",
"LOGIN": "INLOGGEN",
"Password": "Wachtwoord",
"Username": "Gebruikersnaam",
},
"screens/memberList/MemberListScreen": Object {
"Couldn't find any members...": "Er zijn geen leden gevonden...",
"Find a member": "Zoek een lid",
"Member List": "Ledenlijst",
"Sorry! We couldn't load any data.": "Sorry, we konden geen gegevens laden.",
},
"screens/pizza/Pizza": Object {
"screens/pizza/PizzaScreen": Object {
"Changing your order": "Bestelling bewerken",
"Current order": "Huidige bestelling",
"Order pizza for {{title}}": "Bestelling voor {{title}}",
......@@ -91,19 +98,7 @@ Object {
"There is currently no event for which you can order food.": "Er is geen evenement waarvoor je eten kunt bestellen.",
"You did not place an order.": "Je hebt nog geen bestelling geplaatst.",
},
"screens/settings/NotificationsSection": Object {
"(required)": "(verplicht)",
"Notifications": "Notificaties",
"Notifications settings could not be loaded.": "De instellingen voor notificaties konden niet worden geladen.",
},
"screens/user/Login": Object {
"Become a member": "Lid worden",
"Forgot password?": "Wachtwoord vergeten?",
"LOGIN": "INLOGGEN",
"Password": "Wachtwoord",
"Username": "Gebruikersnaam",
},
"screens/user/Profile": Object {
"screens/profile/ProfileScreen": Object {
"About": "Over",
"Achievements for Thalia": "Verdiensten voor Thalia",
"Birthday": "Verjaardag",
......@@ -118,11 +113,16 @@ Object {
"Website": "Website",
"today": "heden",
},
"screens/settings/NotificationsSection": Object {
"(required)": "(verplicht)",
"Notifications": "Notificaties",
"Notifications settings could not be loaded.": "De instellingen voor notificaties konden niet worden geladen.",
},
"screens/welcome/EventDetailCard": Object {
"MORE INFO": "MEER INFO",
"PIZZA": "PIZZA",
},
"screens/welcome/Welcome": Object {
"screens/welcome/WelcomeScreen": Object {
"No events found!": "Geen evenementen gevonden!",
"SHOW THE ENTIRE AGENDA": "TOON DE GEHELE AGENDA",
"Sorry! We couldn't load any data.": "Sorry! We konden geen gegevens laden.",
......
const files = {};
files['app/ui/screens/settings/NotificationsSectionNL'] = require('./nl/app/ui/screens/settings/NotificationsSection.json');
files['app/ui/screens/user/ProfileNL'] = require('./nl/app/ui/screens/user/Profile.json');
files['app/ui/screens/user/LoginNL'] = require('./nl/app/ui/screens/user/Login.json');
files['app/ui/screens/welcome/WelcomeNL'] = require('./nl/app/ui/screens/welcome/Welcome.json');
files['app/ui/screens/profile/ProfileScreenNL'] = require('./nl/app/ui/screens/profile/ProfileScreen.json');
files['app/ui/screens/login/LoginScreenNL'] = require('./nl/app/ui/screens/login/LoginScreen.json');
files['app/ui/screens/memberList/MemberListScreenNL'] = require('./nl/app/ui/screens/memberList/MemberListScreen.json');
files['app/ui/screens/welcome/WelcomeScreenNL'] = require('./nl/app/ui/screens/welcome/WelcomeScreen.json');
files['app/ui/screens/welcome/EventDetailCardNL'] = require('./nl/app/ui/screens/welcome/EventDetailCard.json');
files['app/ui/screens/memberList/MemberListNL'] = require('./nl/app/ui/screens/memberList/MemberList.json');
files['app/ui/screens/pizza/PizzaScreenNL'] = require('./nl/app/ui/screens/pizza/PizzaScreen.json');
files['app/ui/screens/settings/NotificationsSectionNL'] = require('./nl/app/ui/screens/settings/NotificationsSection.json');
files['app/ui/screens/events/CalendarScreenNL'] = require('./nl/app/ui/screens/events/CalendarScreen.json');
files['app/ui/screens/events/RegistrationScreenNL'] = require('./nl/app/ui/screens/events/RegistrationScreen.json');
files['app/ui/screens/events/CalendarItemNL'] = require('./nl/app/ui/screens/events/CalendarItem.json');
files['app/ui/screens/events/EventNL'] = require('./nl/app/ui/screens/events/Event.json');
files['app/ui/screens/events/RegistrationNL'] = require('./nl/app/ui/screens/events/Registration.json');
files['app/ui/screens/events/CalendarNL'] = require('./nl/app/ui/screens/events/Calendar.json');
files['app/ui/screens/pizza/PizzaNL'] = require('./nl/app/ui/screens/pizza/Pizza.json');
files['app/ui/screens/events/EventScreenNL'] = require('./nl/app/ui/screens/events/EventScreen.json');
files['app/ui/components/standardHeader/StandardHeaderNL'] = require('./nl/app/ui/components/standardHeader/StandardHeader.json');
files['app/ui/components/sidebar/SidebarNL'] = require('./nl/app/ui/components/sidebar/Sidebar.json');
files['app/ui/components/errorScreen/ErrorScreenNL'] = require('./nl/app/ui/components/errorScreen/ErrorScreen.json');
files['app/ui/components/sidebar/SidebarNL'] = require('./nl/app/ui/components/sidebar/Sidebar.json');
export default {
nl: {
'screens/settings/NotificationsSection': files['app/ui/screens/settings/NotificationsSectionNL'],
'screens/user/Profile': files['app/ui/screens/user/ProfileNL'],
'screens/user/Login': files['app/ui/screens/user/LoginNL'],
'screens/welcome/Welcome': files['app/ui/screens/welcome/WelcomeNL'],
'screens/profile/ProfileScreen': files['app/ui/screens/profile/ProfileScreenNL'],
'screens/login/LoginScreen': files['app/ui/screens/login/LoginScreenNL'],
'screens/memberList/MemberListScreen': files['app/ui/screens/memberList/MemberListScreenNL'],
'screens/welcome/WelcomeScreen': files['app/ui/screens/welcome/WelcomeScreenNL'],
'screens/welcome/EventDetailCard': files['app/ui/screens/welcome/EventDetailCardNL'],
'screens/memberList/MemberList': files['app/ui/screens/memberList/MemberListNL'],
'screens/pizza/PizzaScreen': files['app/ui/screens/pizza/PizzaScreenNL'],
'screens/settings/NotificationsSection': files['app/ui/screens/settings/NotificationsSectionNL'],
'screens/events/CalendarScreen': files['app/ui/screens/events/CalendarScreenNL'],
'screens/events/RegistrationScreen': files['app/ui/screens/events/RegistrationScreenNL'],
'screens/events/CalendarItem': files['app/ui/screens/events/CalendarItemNL'],
'screens/events/Event': files['app/ui/screens/events/EventNL'],
'screens/events/Registration': files['app/ui/screens/events/RegistrationNL'],
'screens/events/Calendar': files['app/ui/screens/events/CalendarNL'],
'screens/pizza/Pizza': files['app/ui/screens/pizza/PizzaNL'],
'screens/events/EventScreen': files['app/ui/screens/events/EventScreenNL'],
'components/standardHeader/StandardHeader': files['app/ui/components/standardHeader/StandardHeaderNL'],
'components/sidebar/Sidebar': files['app/ui/components/sidebar/SidebarNL'],
'components/errorScreen/ErrorScreen': files['app/ui/components/errorScreen/ErrorScreenNL'],
'components/sidebar/Sidebar': files['app/ui/components/sidebar/SidebarNL'],
},
};
......@@ -5,6 +5,5 @@
"Pizza": "Pizza",
"Profile": "Profiel",
"Registration": "Registratie",
"Settings": "Instellingen",
"Notifications": "Meldingen"
"Settings": "Instellingen"
}
......@@ -21,13 +21,14 @@
"No registration required.": "Aanmelden niet vereist.",
"Registration will open {{start}}": "Aanmelden opent {{start}}",
"Registration is not possible anymore.": "Aanmelden is niet meer mogelijk.",
"Cancellation isn't possible anymore without having to pay the full costs of €{{fine}}. Also note that you will be unable to re-register.": "Afmelden is niet meer mogelijk zonder de volledige kosten van €{{fine}} te betalen. Let op: je kunt je hierna niet meer aanmelden. ",
"Put me on the waiting list": "Zet me op de wachtlijst",
"Register": "Aanmelden",
"By registering, you confirm that you have read the": "Door te registreren, bevestig je dat je de",
"terms and conditions": "voorwaarden",
", that you understand them and that you agree to be bound by them.": "hebt gelezen, dat je ze begrijpt en dat je accepteert eraan gebonden te zijn.",
"Update registration": "Aanmelding bijwerken",
"Cancel registration": "Afmelden",
"Registrations": "Aanmeldingen",
"Could not load the event...": "Kan het evenement niet laden...",
"By registering, you confirm that you have read the": "Door te registreren, bevestig je dat je de",
"terms and conditions": "voorwaarden",
", that you understand them and that you agree to be bound by them.": "hebt gelezen, dat je ze begrijpt en dat je accepteert eraan gebonden te zijn."
"Could not load the event...": "Kan het evenement niet laden..."
}
{
"Order pizza for {{title}}": "Bestelling voor {{title}}",
"You did not place an order.": "Je hebt nog geen bestelling geplaatst.",
"Current order": "Huidige bestelling",
"The order has been paid for.": "Je bestelling is betaald.",
"The order has not yet been paid for.": "Je bestelling is nog niet betaald.",
"Changing your order": "Bestelling bewerken",
"Sorry! We couldn't load any data.": "Sorry! We konden geen gegevens laden.",
"There is currently no event for which you can order food.": "Er is geen evenement waarvoor je eten kunt bestellen.",
"Current order": "Huidige bestelling"
"There is currently no event for which you can order food.": "Er is geen evenement waarvoor je eten kunt bestellen."
}
......@@ -9,7 +9,7 @@
"Birthday": "Verjaardag",
"Personal information": "Persoonlijke gegevens",
"Achievements for Thalia": "Verdiensten voor Thalia",
"today": "heden",
"Chair": "Voorzitter",
"Sorry! We couldn't load any data.": "Sorry! We konden geen gegevens laden.",
"today": "heden"
"Sorry! We couldn't load any data.": "Sorry! We konden geen gegevens laden."
}
......@@ -205,4 +205,4 @@ CalendarScreen.propTypes = {
t: PropTypes.func.isRequired,
};
export default translate('screens/events/Calendar')(withStandardHeader(CalendarScreen, true));
export default translate('screens/events/CalendarScreen')(withStandardHeader(CalendarScreen, true));
......@@ -505,4 +505,4 @@ EventScreen.propTypes = {
t: PropTypes.func.isRequired,
};
export default translate('screens/events/Event')(EventScreen);
export default translate('screens/events/EventScreen')(EventScreen);
......@@ -176,4 +176,4 @@ RegistrationScreen.propTypes = {
t: PropTypes.func.isRequired,
};
export default translate('screens/events/Registration')(withStandardHeader(RegistrationScreen));
export default translate('screens/events/RegistrationScreen')(withStandardHeader(RegistrationScreen));
......@@ -117,4 +117,4 @@ LoginScreen.propTypes = {
status: PropTypes.string.isRequired,
};
export default translate(['screens/user/Login'])(LoginScreen);
export default translate(['screens/user/LoginScreen'])(LoginScreen);
......@@ -103,4 +103,4 @@ MemberListScreen.propTypes = {
t: PropTypes.func.isRequired,
};
export default translate('screens/memberList/MemberList')(MemberListScreen);
export default translate('screens/memberList/MemberListScreen')(MemberListScreen);
......@@ -277,4 +277,4 @@ PizzaScreen.defaultProps = {
order: null,
};
export default translate('screens/pizza/Pizza')(withStandardHeader(PizzaScreen));
export default translate('screens/pizza/PizzaScreen')(withStandardHeader(PizzaScreen));
......@@ -321,4 +321,4 @@ ProfileScreen.propTypes = {
goBack: PropTypes.func.isRequired,
};
export default translate('screens/user/Profile')(ProfileScreen);
export default translate('screens/profile/ProfileScreen')(ProfileScreen);
......@@ -93,4 +93,4 @@ NotificationsSection.propTypes = {
t: PropTypes.func.isRequired,
};
export default translate('screens/settings/PushNotifications')(NotificationsSection);
export default translate('screens/settings/NotificationsSection')(NotificationsSection);
......@@ -69,7 +69,7 @@ const mapDispatchToFooterProps = dispatch => ({
openCalendar: () => dispatch(calendarActions.open()),
});
const FooterComponent = connect(() => ({}), mapDispatchToFooterProps)(translate('screens/welcome/Welcome')(Footer));
const FooterComponent = connect(() => ({}), mapDispatchToFooterProps)(translate('screens/welcome/WelcomeScreen')(Footer));
class WelcomeScreen extends Component {
handleRefresh = () => {
......@@ -160,4 +160,4 @@ WelcomeScreen.propTypes = {
t: PropTypes.func.isRequired,
};
export default translate('screens/welcome/Welcome')(withStandardHeader(WelcomeScreen, true));
export default translate('screens/welcome/WelcomeScreen')(withStandardHeader(WelcomeScreen, true));
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment