Browse Source

update translations. take care of a few odds and ends.

sisyphus
Dustin Falgout 9 years ago
parent
commit
10a5f4fd1a
  1. 9
      themes/antergos/.tx/combine_translations.js
  2. 10
      themes/antergos/README.md
  3. 12
      themes/antergos/css/style.css
  4. 8
      themes/antergos/i18n/es.json
  5. 18
      themes/antergos/i18n/ru.json
  6. 2
      themes/antergos/i18n/translations.json
  7. 24
      themes/antergos/index.html
  8. 1
      themes/antergos/index.theme
  9. 3
      themes/antergos/js/Makefile.am
  10. 18
      themes/antergos/js/greeter.js
  11. 2
      themes/antergos/js/mock.js
  12. 2
      themes/antergos/js/translations.js

9
themes/antergos/.tx/combine_translations.js

@ -1,22 +1,21 @@
/* /*
*
* Copyright © 2015-2016 Antergos * Copyright © 2015-2016 Antergos
* *
* combine_translations.js * combine_translations.js
* *
* This file is part of lightdm-webkit-theme-antergos * This file is part of lightdm-webkit2-greeter
* *
* lightdm-webkit-theme-antergos is free software: you can redistribute it and/or modify * lightdm-webkit2-greeter is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, * the Free Software Foundation, either version 3 of the License,
* or any later version. * or any later version.
* *
* lightdm-webkit-theme-antergos is distributed in the hope that it will be useful, * lightdm-webkit2-greeter is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* The following additional terms are in effect as per Section 7 of this license: * The following additional terms are in effect as per Section 7 of the license:
* *
* The preservation of all legal notices and author attributions in * The preservation of all legal notices and author attributions in
* the material or in the Appropriate Legal Notices displayed * the material or in the Appropriate Legal Notices displayed

10
themes/antergos/README.md

@ -1,5 +1,5 @@
# lightdm-webkit-theme-antergos # lightdm-webkit-theme-antergos
[![Latest Release](https://img.shields.io/github/release/Antergos/lightdm-webkit-theme-antergos.svg)](https://github.com/Antergos/lightdm-webkit-theme-antergos/releases/tag/2.3.0) [![License](https://img.shields.io/badge/license-GPLv3-blue.svg)](https://github.com/Antergos/lightdm-webkit2-greeter/blob/master/LICENSE)
### Overview ### Overview
@ -16,13 +16,13 @@ This is the default theme included with [lightdm-webkit2-greeter](http://github.
</center> </center>
### Prerequisites ### Prerequisites
* lightdm-webkit-greeter * lightdm-webkit2-greeter
### Installation ### Installation
This theme is included with `lightdm-webkit2-greeter` which is installed by default for Antergos users. Non-Antergos users should see [lightdm-webkit2-greeter](https://github.com/Antergos/lightdm-webkit2-greeter/) for install details. This theme is included with `lightdm-webkit2-greeter` which is installed by default for Antergos users. Non-Antergos users should see [lightdm-webkit2-greeter](https://github.com/Antergos/lightdm-webkit2-greeter/) for installation details.
#### ***NOTE:*** #### ***NOTE:***
The last version of this theme which supports the legacy Webkit1 greeter is [v2.3.2](https://github.com/Antergos/lightdm-webkit-theme-antergos/releases/tag/2.3.2). The last version of this theme which supported the legacy Webkit1 greeter was [v2.3.2](https://github.com/Antergos/lightdm-webkit-theme-antergos/releases/tag/2.3.2).
Versions of this theme later than ***2.3.2*** will not work with the legacy Webkit1 greeter. If you want to use the latest version of the theme you must use the Webkit2 greeter. Versions of this theme later than ***2.3.2*** will not work with the legacy Webkit1 greeter. If you want to use the latest version of the theme you must use the Webkit2 greeter.
#### To use [v2.3.2](https://github.com/Antergos/lightdm-webkit-theme-antergos/releases/tag/2.3.2) of this theme with the legacy Webkit1 greeter: #### To use [v2.3.2](https://github.com/Antergos/lightdm-webkit-theme-antergos/releases/tag/2.3.2) of this theme with the legacy Webkit1 greeter:
@ -38,7 +38,7 @@ webkit-theme=antergos
``` ```
Optionally you can install the included font `Lato`. Optionally you can install the included font `Open Sans`.
Now if you restart your computer (or at least if you restart lightdm), the antergos greeter theme should be activated. Now if you restart your computer (or at least if you restart lightdm), the antergos greeter theme should be activated.

12
themes/antergos/css/style.css

@ -4,19 +4,19 @@
* *
* style.css * style.css
* *
* This file is part of lightdm-webkit-theme-antergos * This file is part of lightdm-webkit2-greeter
* *
* lightdm-webkit-theme-antergos is free software: you can redistribute it and/or modify * lightdm-webkit2-greeter is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, * the Free Software Foundation, either version 3 of the License,
* or any later version. * or any later version.
* *
* lightdm-webkit-theme-antergos is distributed in the hope that it will be useful, * lightdm-webkit2-greeter is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* The following additional terms are in effect as per Section 7 of this license: * The following additional terms are in effect as per Section 7 of the license:
* *
* The preservation of all legal notices and author attributions in * The preservation of all legal notices and author attributions in
* the material or in the Appropriate Legal Notices displayed * the material or in the Appropriate Legal Notices displayed
@ -140,13 +140,15 @@ a {
border-color: #d6004b; border-color: #d6004b;
} }
.bg-switch .bgs .bg img { .bg-switch .bgs .bg div {
width: 145px; width: 145px;
height: 95px; height: 95px;
border: 2px solid #FFFFFF; border: 2px solid #FFFFFF;
margin-bottom: 10px; margin-bottom: 10px;
cursor: pointer; cursor: pointer;
transition: all 0.3s linear; transition: all 0.3s linear;
background-size: cover;
background-repeat: no-repeat;
} }
.hovered { .hovered {

8
themes/antergos/i18n/es.json

@ -1,10 +1,10 @@
{ {
"auth_failed": UH oh! Error de autenticación. Por favor, vuelva a intentarlo.", "auth_failed": Vaya! Error de autenticación. Por favor, vuelva a intentarlo.",
"background_options": "Opciones de fondo", "background_options": "Opciones de fondo",
"cancel": "Cancelar", "cancel": "Cancelar",
"confirm_system_action": "¿Estás seguro?", "confirm_system_action": "¿Está seguro?",
"debug_log": "registro de depuración", "debug_log": "Registro de depuración errores",
"greeting": "¡Bienvenida!", "greeting": "¡Bienvenido!",
"hibernate": "Hibernar", "hibernate": "Hibernar",
"random": "Al azar", "random": "Al azar",
"reset": "Reiniciar", "reset": "Reiniciar",

18
themes/antergos/i18n/ru.json

@ -1,14 +1,14 @@
{ {
"auth_failed": "Uh Oh! Ошибка аутентификации. Пожалуйста, попробуйте еще раз.", "auth_failed": "Ой! Ошибка аутентификации. Пожалуйста, попробуйте еще раз.",
"background_options": "Фоновые Опции", "background_options": "Фоновые настройки",
"cancel": "Отмена", "cancel": "Отмена",
"confirm_system_action": "Ты уверен?", "confirm_system_action": "Вы уверены?",
"debug_log": "Журнал отладки", "debug_log": "Журнал отладки",
"greeting": "Добро пожаловат!", "greeting": "Добро пожаловать!",
"hibernate": "зимовать", "hibernate": "Гибернация",
"random": "случайный", "random": "Выборочно",
"reset": "Сброс", "reset": "Сброс",
"restart": "Перезапуск", "restart": "Перезагрузка",
"shutdown": "Неисправность", "shutdown": "Выключить",
"suspend": "приостановить" "suspend": "Приостановить"
} }

2
themes/antergos/i18n/translations.json

File diff suppressed because one or more lines are too long

24
themes/antergos/index.html

@ -5,19 +5,19 @@
~ ~
~ index.html ~ index.html
~ ~
~ This file is part of lightdm-webkit-theme-antergos ~ This file is part of lightdm-webkit2-greeter
~ ~
~ lightdm-webkit-theme-antergos is free software: you can redistribute it and/or modify ~ lightdm-webkit2-greeter is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by ~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, ~ the Free Software Foundation, either version 3 of the License,
~ or any later version. ~ or any later version.
~ ~
~ lightdm-webkit-theme-antergos is distributed in the hope that it will be useful, ~ lightdm-webkit2-greeter is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details. ~ GNU General Public License for more details.
~ ~
~ The following additional terms are in effect as per Section 7 of this license: ~ The following additional terms are in effect as per Section 7 of the license:
~ ~
~ The preservation of all legal notices and author attributions in ~ The preservation of all legal notices and author attributions in
~ the material or in the Appropriate Legal Notices displayed ~ the material or in the Appropriate Legal Notices displayed
@ -37,7 +37,7 @@
<meta name="author" content="Dustin Falgout"> <meta name="author" content="Dustin Falgout">
<!--For testing the theme in a web browser --> <!--For testing the theme in a web browser -->
<script type="text/javascript" src="js/mock.js"></script> <script type="text/javascript" src="../tools/mock.js"></script>
<!-- Vendor CSS --> <!-- Vendor CSS -->
<link rel="stylesheet" type="text/css" href="css/vendor/bootstrap.min.css"/> <link rel="stylesheet" type="text/css" href="css/vendor/bootstrap.min.css"/>
@ -136,27 +136,27 @@
<tr> <tr>
<td> <td>
<div class="input-group"> <div class="input-group">
<input id="passwordField" type="password" class="password form-control"/> <input id="passwordField" title="input password" type="password" class="password form-control"/>
<div class="input-group-btn"> <div class="input-group-btn">
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-primary submit_passwd" type="button"> <button class="btn btn-primary submit_passwd" type="button" title="submit password">
<i class="fa fa-sign-in"></i> <i class="fa fa-sign-in"></i>
</button> </button>
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown"> <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" title="show options menu">
<i class="fa fa-caret-down"></i> <i class="fa fa-caret-down"></i>
</button> </button>
<ul class="dropdown-menu pull-right"> <ul class="dropdown-menu pull-right" title="options menu">
<li> <li>
<a href="#" class="cancel_auth" data-i18n="cancel"> <a href="#" class="cancel_auth" data-i18n="cancel" title="cancel">
<i class="fa fa-times"></i> ${i18n}</a> <i class="fa fa-times"></i> ${i18n}</a>
</li> </li>
<li> <li>
<a href="#" onclick="$(document.location.reload(true))" data-i18n="reset"> <a href="#" onclick="$(document.location.reload(true))" data-i18n="reset" title="reset">
<i class="fa fa-refresh"></i> ${i18n}</a> <i class="fa fa-refresh"></i> ${i18n}</a>
</li> </li>
<li> <li>
<a href="#" data-i18n="debug_log"> <a href="#" data-i18n="debug_log" title="debug log">
<i class="fa fa-bug"></i> ${i18n}</a> <i class="fa fa-bug"></i> ${i18n}</a>
</li> </li>
</ul> </ul>

1
themes/antergos/index.theme

@ -1,6 +1,5 @@
[theme] [theme]
name=Antergos name=Antergos
version=2.4.1
description=Antergos Theme description=Antergos Theme
engine=lightdm-webkit2-greeter engine=lightdm-webkit2-greeter
url=index.html url=index.html

3
themes/antergos/js/Makefile.am

@ -1,8 +1,7 @@
javascriptdir = $(THEME_DIR)/antergos/js javascriptdir = $(THEME_DIR)/antergos/js
javascript_DATA = \ javascript_DATA = \
greeter.js \ greeter.js \
translations.js \ translations.js
mock.js
EXTRA_DIST = $(javascript_DATA) EXTRA_DIST = $(javascript_DATA)

18
themes/antergos/js/greeter.js

@ -4,22 +4,22 @@
* *
* greeter.js * greeter.js
* *
* This file is part of lightdm-webkit-theme-antergos * This file is part of lightdm-webkit2-greeter
* *
* lightdm-webkit-theme-antergos is free software: you can redistribute it and/or modify * lightdm-webkit2-greeter is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, * the Free Software Foundation, either version 3 of the License,
* or any later version. * or any later version.
* *
* lightdm-webkit-theme-antergos is distributed in the hope that it will be useful, * lightdm-webkit2-greeter is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* The following additional terms are in effect as per Section 7 of this license: * The following additional terms are in effect as per Section 7 of the license:
* *
* The preservation of all legal notices and author attributions in * The preservation of all legal notices and author attributions in
* the material or in the Appropriate Legal Notices displayed * the material or in the Appropriate Legal Notices displayed
* by works containing it is required. * by works containing it is required.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
@ -145,7 +145,7 @@ class AntergosThemeUtils {
background_images_dir = config.get_str( 'branding', 'background_images' ) || ''; background_images_dir = config.get_str( 'branding', 'background_images' ) || '';
if ( background_images_dir ) { if ( background_images_dir ) {
background_images = greeterutil.dirlist( background_images_dir ) || []; background_images = greeterutil.dirlist( background_images_dir ) || [];
this.log(background_images); _util.log(background_images);
} }
if ( background_images && background_images.length ) { if ( background_images && background_images.length ) {
@ -299,8 +299,8 @@ class AntergosBackgroundManager {
$('[data-img="random"]').click(this.background_selected_handler); $('[data-img="random"]').click(this.background_selected_handler);
for ( var image_file of _util.background_images ) { for ( var image_file of _util.background_images ) {
var $link = $( '<a href="#"><img>' ), var $link = $( '<a href="#"><div>' ),
$img_el = $link.children( 'img' ), $img_el = $link.children( 'div' ),
img_url_tpl = `file://${image_file}`; img_url_tpl = `file://${image_file}`;
$link.addClass( 'bg clearfix' ).attr( 'data-img', img_url_tpl ); $link.addClass( 'bg clearfix' ).attr( 'data-img', img_url_tpl );
@ -434,7 +434,7 @@ class AntergosTheme {
// Loop through the array of LightDMUser objects to create our user list. // Loop through the array of LightDMUser objects to create our user list.
for ( var user of lightdm.users ) { for ( var user of lightdm.users ) {
var last_session = _util.cache_get( 'user', user.name, 'session' ), var last_session = _util.cache_get( 'user', user.name, 'session' ),
image_src = user.image.length ? user.image : _util.user_image; image_src = ( user.hasOwnProperty('image') && user.image.length ) ? user.image : _util.user_image;
if ( null === last_session ) { if ( null === last_session ) {
// For backwards compatibility // For backwards compatibility

2
themes/antergos/js/mock.js

@ -4,7 +4,7 @@
* *
* mock.js * mock.js
* *
* This file is part of lightdm-webkit-theme-antergos * This file is part of lightdm-webkit2-greeter
* *
* lightdm-webkit-theme-antergos is free software: you can redistribute it and/or modify * lightdm-webkit-theme-antergos is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

2
themes/antergos/js/translations.js

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save