MT#3961 Rework German localization.

Some fixes along the path where strings where not prepared for
localization yet, or element widths were too small.
agranig/pbxapi
Andreas Granig 12 years ago
parent 42159350a0
commit eaad8dfda5

@ -77,7 +77,6 @@ sub auto :Private {
}
}
# don't redirect to login page for ajax uris
if($c->request->path =~ /\/ajax$/) {
$c->response->body($c->loc("403 - Permission denied"));
@ -102,13 +101,18 @@ sub auto :Private {
return;
}
if(defined $c->request->params->{lang} &&
$c->request->params->{lang} =~ /^\w+$/ && (
exists $c->installed_languages->{$c->request->params->{lang}} ||
$c->request->params->{lang} eq 'i_default') ) {
$c->session->{lang} = $c->request->params->{lang};
$c->response->cookies->{ngcp_panel_lang} = { value => $c->request->params->{lang}, expires => '+3M', };
$c->log->debug("Setting language to ". $c->request->params->{lang});
if(defined $c->request->params->{lang} && $c->request->params->{lang} =~ /^\w+$/) {
$c->log->debug("checking language");
if($c->request->params->{lang} eq "en") {
$c->log->debug("setting language ".$c->request->params->{lang}." to default");
$c->request->params->{lang} = "i_default";
}
if(exists $c->installed_languages->{$c->request->params->{lang}} ||
$c->request->params->{lang} eq "i_default") {
$c->session->{lang} = $c->request->params->{lang};
$c->response->cookies->{ngcp_panel_lang} = { value => $c->request->params->{lang}, expires => '+3M', };
$c->log->debug("Setting language to ". $c->request->params->{lang});
}
}
if (defined $c->session->{lang}) {
$c->languages([$c->session->{lang}, "i_default"]);

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -24,7 +24,7 @@
</a>
<ul class="dropdown-menu pull-right">
<li><a href="?lang=i_default"><img src="/img/lang/en.png" class="ngcp-lang-flag"/> English</a></li>
<li><a href="?lang=en"><img src="/img/lang/en.png" class="ngcp-lang-flag"/> English</a></li>
<li><a href="?lang=de"><img src="/img/lang/de.png" class="ngcp-lang-flag"/> German</a></li>
</ul>
</li>

@ -15,6 +15,10 @@ body {
padding-right: 10px;
}
.btn [class^="icon-"] {
margin-top: 4px;
}
/* ---------
The modal
------------*/

@ -153,7 +153,7 @@
[%
PROCESS "helpers/modal.tt";
modal_header(m.create_flag=0,
m.name = "Preference '" _ c.loc(helper.preference_meta.label) _"'");
m.name = c.loc("Preference '") _ c.loc(helper.preference_meta.label) _"'");
-%]
[% IF helper.preference_meta.attribute == "allowed_ips" %]

@ -2,7 +2,7 @@
<div class="account-container login stacked">
<div class="content clearfix">
<h1>[% c.loc('[_1] Sign In', realm.ucfirst) %]</h1>
<p>[% c.loc('Sign in using your [_1] credentials:', realm) %]</p>
<p>[% c.loc('Sign in using your [_1] credentials:', realm.ucfirst) %]</p>
[% form.render %]
</div>
</div>

@ -1,4 +1,4 @@
[% META title = 'System Statistics' -%]
[% site_config.title = c.loc('System Statistics') -%]
<!--[if lte IE 9]><script language="javascript" type="text/javascript" src="/js/jsrrd/flot/excanvas.min.js"></script><![endif]-->
<script type="text/javascript" src="/js/libs/jsrrd/jsrrd/binaryXHR.js"></script>

@ -1,5 +1,15 @@
[% site_config.title = c.loc('Web Phone for ') _ subscriber.username _ '@' _ subscriber.domain.domain -%]
<script type="text/javascript" src="/js/libs/jssip-0.3.0.min.js"></script>
<!--<script type="text/javascript" src="/js/libs/stanzaio.bundle.min.js"></script>-->
<script type="text/javascript" src="/js/libs/stanzaio.bundle.js"></script>
<script type="text/javascript" src="/js/libs/bootstrap-select.min.js"></script>
<script type="text/javascript" src="/js/libs/bootstrap-switch.js"></script>
<script type="text/javascript" src="/js/libs/jquery.slimscroll.min.js"></script>
<link rel="stylesheet" type="text/css" href="/css/bootstrap-select/bootstrap-select.min.css"/>
<link rel="stylesheet" type="text/css" href="/css/bootstrap-switch/bootstrap-switch.css"/>
<link rel="stylesheet" type="text/css" href="/font/font-awesome/css/font-awesome.min.css"/>
<style>
#xmpp-roster {
list-style-type: none;
@ -62,6 +72,9 @@
color: #666;
}
.has-switch {
min-width: 200px;
}
</style>
<div class="row">
@ -73,16 +86,6 @@
<div class="ngcp-separator"></div>
<script type="text/javascript" src="/js/libs/jssip-0.3.0.min.js"></script>
<!--<script type="text/javascript" src="/js/libs/stanzaio.bundle.min.js"></script>-->
<script type="text/javascript" src="/js/libs/stanzaio.bundle.js"></script>
<script type="text/javascript" src="/js/libs/bootstrap-select.min.js"></script>
<script type="text/javascript" src="/js/libs/bootstrap-switch.js"></script>
<script type="text/javascript" src="/js/libs/jquery.slimscroll.min.js"></script>
<link rel="stylesheet" type="text/css" href="/css/bootstrap-select/bootstrap-select.min.css"/>
<link rel="stylesheet" type="text/css" href="/css/bootstrap-switch/bootstrap-switch.css"/>
<link rel="stylesheet" type="text/css" href="/font/font-awesome/css/font-awesome.min.css"/>
<script type="text/javascript">
var phone = null;
@ -585,7 +588,7 @@
<div>
<h3>[% c.loc('Buddy List') %]</h3>
<div class="row span6" style="margin:0; clear:both; padding:10px;">
<input id="xmpp-toggle-offline" style="float:left" type="checkbox" data-on="success" data-off="default" data-on-label="[% c.loc('Show Offline') %]" data-off-label="[% c.loc('Hide Offline') %]">
<input id="xmpp-toggle-offline" style="float:left;" type="checkbox" data-on="success" data-off="default" data-on-label="[% c.loc('Show Offline') %]" data-off-label="[% c.loc('Hide Offline') %]">
<input id="sip_toggle_video" checked style="float:left" type="checkbox" data-on="success" data-off="default" data-on-label="[% c.loc('Audio&amp;Video') %]" data-off-label="[% c.loc('Audio Only') %]">
</div>
<div class="row span6" style="margin:0; clear:both;">

Loading…
Cancel
Save