diff options
| -rw-r--r-- | lib/Travelynx/Controller/Account.pm | 4 | ||||
| -rw-r--r-- | share/locales/de_DE.po | 8 | ||||
| -rw-r--r-- | share/locales/en_GB.po | 8 | ||||
| -rw-r--r-- | share/locales/fr_FR.po | 8 | ||||
| -rw-r--r-- | share/locales/pl_PL.po | 8 | ||||
| -rw-r--r-- | templates/language.html.ep | 12 | 
6 files changed, 45 insertions, 3 deletions
diff --git a/lib/Travelynx/Controller/Account.pm b/lib/Travelynx/Controller/Account.pm index 8121f0a..f4c6bcb 100644 --- a/lib/Travelynx/Controller/Account.pm +++ b/lib/Travelynx/Controller/Account.pm @@ -891,14 +891,14 @@ sub change_language {  		}  		$self->users->set_language(  			uid      => $self->current_user->{id}, -			language => $language, +			language => $language eq 'none' ? undef : $language,  		);  		$self->flash( success => 'language' );  		$self->redirect_to('account');  	}  	else {  		my @languages = @{ $self->current_user->{languages} }; -		$self->param( language => $languages[0] // q{} ); +		$self->param( language => $languages[0] // 'none' );  		$self->render('language');  	}  } diff --git a/share/locales/de_DE.po b/share/locales/de_DE.po index a6f58e1..0c12456 100644 --- a/share/locales/de_DE.po +++ b/share/locales/de_DE.po @@ -152,6 +152,14 @@ msgstr "Quelltext"  msgid "landingpage.disclaimer.source-post"  msgstr "laden und eine eigene Instanz aufsetzen." +# language.html.ep + +msgid "language.language" +msgstr "Sprache" + +msgid "language.browser-default" +msgstr "Gleiche Sprache wie Web-Browser" +  # login.html.ep  msgid "login.accept-tos-pre" diff --git a/share/locales/en_GB.po b/share/locales/en_GB.po index 9881705..715bd2d 100644 --- a/share/locales/en_GB.po +++ b/share/locales/en_GB.po @@ -152,6 +152,14 @@ msgstr "source code"  msgid "landingpage.disclaimer.source-post"  msgstr "and host your own instance." +# language.html.ep + +msgid "language.language" +msgstr "Language" + +msgid "language.browser-default" +msgstr "Use language(s) requested by browser" +  # login.html.ep  msgid "login.tos" diff --git a/share/locales/fr_FR.po b/share/locales/fr_FR.po index 33f14da..5ad336b 100644 --- a/share/locales/fr_FR.po +++ b/share/locales/fr_FR.po @@ -125,6 +125,14 @@ msgstr ""  msgid "landingpage.disclaimer.source-post"  msgstr "" +# language.html.ep + +msgid "language.language" +msgstr "" + +msgid "language.browser-default" +msgstr "" +  # login.html.ep  msgid "login.tos" diff --git a/share/locales/pl_PL.po b/share/locales/pl_PL.po index 2ce1b61..80de143 100644 --- a/share/locales/pl_PL.po +++ b/share/locales/pl_PL.po @@ -125,6 +125,14 @@ msgstr ""  msgid "landingpage.disclaimer.source-post"  msgstr "" +# language.html.ep + +msgid "language.language" +msgstr "" + +msgid "language.browser-default" +msgstr "" +  # login.html.ep  msgid "login.tos" diff --git a/templates/language.html.ep b/templates/language.html.ep index 6cc0231..cb51746 100644 --- a/templates/language.html.ep +++ b/templates/language.html.ep @@ -1,10 +1,20 @@ -<h1>Sprache</h1> +<h1><%= L('language.language') %></h1>  %= form_for '/account/language' => (method => 'POST') => begin  	%= csrf_field  	<div class="row">  		<div class="input-field col s12">  			<div>  				<label> +					%= radio_button language => 'none' +					<span>–: <%= L('language.browser-default') %></span> +				</label> +			</div> +		</div> +	</div> +	<div class="row"> +		<div class="input-field col s12"> +			<div> +				<label>  					%= radio_button language => 'de-DE'  					<span>de-DE: Deutsch (hochdeutsch)</span>  				</label>  | 
