Skip to content
This repository has been archived by the owner on Jan 28, 2021. It is now read-only.

Commit

Permalink
Use locale.
Browse files Browse the repository at this point in the history
  • Loading branch information
echicken committed Jan 14, 2019
1 parent 92e05ce commit f1b2a12
Showing 1 changed file with 14 additions and 16 deletions.
30 changes: 14 additions & 16 deletions web/root/index.xjs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
load(settings.web_lib + 'sidebar.js');
load(settings.web_lib + 'language.js');

var _language = getLanguage(settings.language_file || 'english.ini', 'main');

var page = (
( typeof http_request.query.page === 'undefined' ||
!file_exists(
Expand Down Expand Up @@ -117,10 +115,10 @@
<div class="modal-body" id="popUpModalBody"></div>
<div class="modal-footer">
<button type="button" class="btn btn-default" id="popUpModalCloseButton">
<?xjs write(_language.button_close); ?>
<?xjs write(locale.strings.main.button_close); ?>
</button>
<button type="button" class="btn btn-primary" id="popUpModalActionButton" hidden>
<?xjs write(_language.button_submit); ?>
<?xjs write(locale.strings.main.button_submit); ?>
</button>
</div>
</div>
Expand All @@ -132,7 +130,7 @@
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">
<?xjs write(_language.label_sidebar); ?>
<?xjs write(locale.strings.main.label_sidebar); ?>
</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
Expand All @@ -151,26 +149,26 @@
<?xjs if (settings.user_registration) { ?>
<li>
<a href="./?page=000-register.xjs">
<?xjs write(_language.menu_item_register); ?>
<?xjs write(locale.strings.main.menu_item_register); ?>
</a>
</li>
<?xjs } ?>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<?xjs write(_language.menu_item_login); ?>
<?xjs write(locale.strings.main.menu_item_login); ?>
<span class="caret"></span>
</a>
<div id="login-form" class="dropdown-menu" style="padding:15px; padding-bottom:0px;">
<form id="form-login">
<label for="input-username" class="sr-only">
<?xjs write(_language.input_username); ?>
<?xjs write(locale.strings.main.input_username); ?>
</label>
<input id="input-username" title="<?xjs write(_language.input_username); ?>" type="text" class="dropdown form-control" placeholder="<?xjs write(_language.input_username); ?>">
<input id="input-username" title="<?xjs write(locale.strings.main.input_username); ?>" type="text" class="dropdown form-control" placeholder="<?xjs write(locale.strings.main.input_username); ?>">
<label for="input-password" class="sr-only">
<?xjs write(_language.input_password); ?>
<?xjs write(locale.strings.main.input_password); ?>
</label>
<input id="input-password" title="<?xjs write(_language.input_password); ?>" type="password" class="dropdown form-control" placeholder="<?xjs write(_language.input_password); ?>">
<input id="button-login" class="dropdown btn btn-primary" type="submit" value="<?xjs write(_language.button_login); ?>">
<input id="input-password" title="<?xjs write(locale.strings.main.input_password); ?>" type="password" class="dropdown form-control" placeholder="<?xjs write(locale.strings.main.input_password); ?>">
<input id="button-login" class="dropdown btn btn-primary" type="submit" value="<?xjs write(locale.strings.main.button_login); ?>">
</form>
</div>
</li>
Expand All @@ -184,13 +182,13 @@
<ul class="dropdown-menu">
<li>
<a href="./?page=000-mail.xjs">
<?xjs write(_language.menu_item_mail); ?>
<span class="badge scanned" title="<?xjs write(_language.label_unread_mail); ?>" id="badge-unread-mail-inner"></span>
<?xjs write(locale.strings.main.menu_item_mail); ?>
<span class="badge scanned" title="<?xjs write(locale.strings.main.label_unread_mail); ?>" id="badge-unread-mail-inner"></span>
</a>
</li>
<li>
<a id="button-logout" href="#">
<?xjs write(_language.menu_item_logout); ?>
<?xjs write(locale.strings.main.menu_item_logout); ?>
</a>
</li>
</ul>
Expand All @@ -207,7 +205,7 @@
<div class="col-xs-12 col-sm-<?xjs write(settings.layout_sidebar_off || page_ctrl.options.no_sidebar ? 12 : 9); ?>">
<div style="clear:both;">
<p class="pull-<?xjs write(settings.layout_sidebar_left ? 'left' : 'right'); ?> visible-xs">
<button title="Toggle sidebar" type="button" class="btn btn-primary btn-xs" data-toggle="offcanvas"><span class="glyphicon glyphicon-tasks"></span><?xjs write(_language.label_sidebar); ?></button>
<button title="Toggle sidebar" type="button" class="btn btn-primary btn-xs" data-toggle="offcanvas"><span class="glyphicon glyphicon-tasks"></span><?xjs write(locale.strings.main.label_sidebar); ?></button>
</p>
</div>
<?xjs writePage(); ?>
Expand Down

0 comments on commit f1b2a12

Please sign in to comment.