Skip to content

Commit 6cabfd1

Browse files
nilsteampassnetnilsteampassnet
authored andcommitted
2.1.27
Fix for #2393, #2394
1 parent 9dcec80 commit 6cabfd1

11 files changed

+159
-102
lines changed

changelog.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
2.1.27
22
20/
3+
#2394 knowledge base page characters appear with "?"
4+
#2393 After Deleting User, KB Is Blank
35
#2380 Increase fields size to prevent errors
46
#2372 Upload a file with dash in file name wil be renamed with underscore
57
Fix: loading folder information is wrong when using 'max'
Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
11
{
2-
"sProcessing": "Feldolgoz�s...",
3-
"sLengthMenu": "_MENU_ tal�lat oldalank�nt",
4-
"sZeroRecords": "Nincs a keres�snek megfelelo tal�lat",
5-
"sInfo": "Tal�latok: _START_ - _END_ �sszesen: _TOTAL_",
6-
"sInfoEmpty": "Nulla tal�lat",
7-
"sInfoFiltered": "(_MAX_ �sszes rekord k�z�l szurve)",
8-
"sInfoPostFix": "",
9-
"sSearch": "Keres�s:",
10-
"sUrl": "",
11-
"oPaginate": {
12-
"sFirst": "Elso",
13-
"sPrevious": "Elozo",
14-
"sNext": "K�vetkezo",
15-
"sLast": "Utols�"
16-
}
2+
"sEmptyTable": "Nincs rendelkezésre álló adat",
3+
"sInfo": "Találatok: _START_ - _END_ Összesen: _TOTAL_",
4+
"sInfoEmpty": "Nulla találat",
5+
"sInfoFiltered": "(_MAX_ összes rekord közül szűrve)",
6+
"sInfoPostFix": "",
7+
"sInfoThousands": " ",
8+
"sLengthMenu": "_MENU_ találat oldalanként",
9+
"sLoadingRecords": "Betöltés...",
10+
"sProcessing": "Feldolgozás...",
11+
"sSearch": "Keresés:",
12+
"sZeroRecords": "Nincs a keresésnek megfelelő találat",
13+
"oPaginate": {
14+
"sFirst": "Első",
15+
"sPrevious": "Előző",
16+
"sNext": "Következő",
17+
"sLast": "Utolsó"
18+
},
19+
"oAria": {
20+
"sSortAscending": ": aktiválja a növekvő rendezéshez",
21+
"sSortDescending": ": aktiválja a csökkenő rendezéshez"
22+
}
1723
}
Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
1-
{
2-
"sProcessing": "Caricamento...",
3-
"sLengthMenu": "Visualizza _MENU_ elementi",
4-
"sZeroRecords": "La ricerca non ha portato alcun risultato.",
5-
"sInfo": "Vista da _START_ a _END_ di _TOTAL_ elementi",
6-
"sInfoEmpty": "Vista da 0 a 0 di 0 elementi",
7-
"sInfoFiltered": "(filtrati da _MAX_ elementi totali)",
8-
"sInfoPostFix": "",
9-
"sSearch": "Cerca:",
10-
"sUrl": "",
1+
{
2+
"sEmptyTable": "Nessun dato presente nella tabella",
3+
"sInfo": "Vista da _START_ a _END_ di _TOTAL_ elementi",
4+
"sInfoEmpty": "Vista da 0 a 0 di 0 elementi",
5+
"sInfoFiltered": "(filtrati da _MAX_ elementi totali)",
6+
"sInfoPostFix": "",
7+
"sInfoThousands": ".",
8+
"sLengthMenu": "Visualizza _MENU_ elementi",
9+
"sLoadingRecords": "Caricamento...",
10+
"sProcessing": "Elaborazione...",
11+
"sSearch": "Cerca:",
12+
"sZeroRecords": "La ricerca non ha portato alcun risultato.",
1113
"oPaginate": {
12-
"sFirst": "Inizio",
13-
"sPrevious": "Precedente",
14-
"sNext": "Successivo",
15-
"sLast": "Fine"
14+
"sFirst": "Inizio",
15+
"sPrevious": "Precedente",
16+
"sNext": "Successivo",
17+
"sLast": "Fine"
18+
},
19+
"oAria": {
20+
"sSortAscending": ": attiva per ordinare la colonna in ordine crescente",
21+
"sSortDescending": ": attiva per ordinare la colonna in ordine decrescente"
1622
}
1723
}
Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,25 @@
11
{
2-
sProcessing: "Laster...",
3-
sLengthMenu: "Vis: _MENU_ linjer",
4-
sZeroRecords: "Ingen linjer matcher s�ket",
5-
sInfo: "Viser _START_ til _END_ av _TOTAL_ linjer",
6-
sInfoEmpty: "Viser 0 til 0 av 0 linjer",
7-
sInfoFiltered: "(filtrert fra _MAX_ totalt antall linjer)",
8-
sInfoPostFix: "",
9-
sSearch: "S�k:",
10-
sUrl: "",
11-
oPaginate: {
12-
sFirst: "F�rste",
13-
sPrevious: "Forrige",
14-
sNext: "Neste",
15-
sLast: "Siste"
16-
}
2+
"sEmptyTable": "Inga data tilgjengeleg i tabellen",
3+
"sInfo": "Syner _START_ til _END_ av _TOTAL_ linjer",
4+
"sInfoEmpty": "Syner 0 til 0 av 0 linjer",
5+
"sInfoFiltered": "(filtrert frå _MAX_ totalt antal linjer)",
6+
"sInfoPostFix": "",
7+
"sInfoThousands": " ",
8+
"sLoadingRecords": "Lastar...",
9+
"sLengthMenu": "Syn _MENU_ linjer",
10+
"sLoadingRecords": "Lastar...",
11+
"sProcessing": "Lastar...",
12+
"sSearch": "Søk:",
13+
"sUrl": "",
14+
"sZeroRecords": "Inga linjer treff på søket",
15+
"oPaginate": {
16+
"sFirst": "Fyrste",
17+
"sPrevious": "Forrige",
18+
"sNext": "Neste",
19+
"sLast": "Siste"
20+
},
21+
"oAria": {
22+
"sSortAscending": ": aktiver for å sortere kolonna stigande",
23+
"sSortDescending": ": aktiver for å sortere kolonna synkande"
24+
}
1725
}
Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
2+
"sEmptyTable": "Nenhum registro encontrado",
23
"sProcessing": "A processar...",
34
"sLengthMenu": "Mostrar _MENU_ registos",
4-
"sZeroRecords": "N�o foram encontrados resultados",
5-
"sInfo": "Mostrando de _START_ at� _END_ de _TOTAL_ registos",
6-
"sInfoEmpty": "Mostrando de 0 at� 0 de 0 registos",
5+
"sZeroRecords": "Não foram encontrados resultados",
6+
"sInfo": "Mostrando de _START_ até _END_ de _TOTAL_ registos",
7+
"sInfoEmpty": "Mostrando de 0 até 0 de 0 registos",
78
"sInfoFiltered": "(filtrado de _MAX_ registos no total)",
89
"sInfoPostFix": "",
910
"sSearch": "Procurar:",
@@ -12,6 +13,10 @@
1213
"sFirst": "Primeiro",
1314
"sPrevious": "Anterior",
1415
"sNext": "Seguinte",
15-
"sLast": "�ltimo"
16+
"sLast": "Último"
17+
},
18+
"oAria": {
19+
"sSortAscending": ": Ordenar colunas de forma ascendente",
20+
"sSortDescending": ": Ordenar colunas de forma descendente"
1621
}
1722
}

includes/language/datatables.portuguese_br.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
{
22
"sEmptyTable": "Nenhum registro encontrado",
3-
"sInfo": "Mostrando de _START_ at� _END_ de _TOTAL_ registros",
4-
"sInfoEmpty": "Mostrando 0 at� 0 de 0 registros",
3+
"sInfo": "Mostrando de _START_ até _END_ de _TOTAL_ registros",
4+
"sInfoEmpty": "Mostrando 0 até 0 de 0 registros",
55
"sInfoFiltered": "(Filtrados de _MAX_ registros)",
66
"sInfoPostFix": "",
77
"sInfoThousands": ".",
8-
"sLengthMenu": "_MENU_ resultados por p�gina",
8+
"sLengthMenu": "_MENU_ resultados por página",
99
"sLoadingRecords": "Carregando...",
1010
"sProcessing": "Processando...",
1111
"sZeroRecords": "Nenhum registro encontrado",
1212
"sSearch": "Pesquisar",
1313
"oPaginate": {
14-
"sNext": "Pr�ximo",
14+
"sNext": "Próximo",
1515
"sPrevious": "Anterior",
1616
"sFirst": "Primeiro",
17-
"sLast": "�ltimo"
17+
"sLast": "Último"
1818
},
1919
"oAria": {
2020
"sSortAscending": ": Ordenar colunas de forma ascendente",
Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
{
2-
"sProcessing": "Подождите...",
3-
"sLengthMenu": "Показать _MENU_ записей",
4-
"sZeroRecords": "Записи отсутствуют.",
5-
"sInfo": "Записи с _START_ до _END_ из _TOTAL_ записей",
6-
"sInfoEmpty": "Записи с 0 до 0 из 0 записей",
7-
"sInfoFiltered": "(отфильтровано из _MAX_ записей)",
8-
"sInfoPostFix": "",
9-
"sSearch": "Поиск:",
10-
"sUrl": "",
11-
"oPaginate": {
12-
"sFirst": "Первая",
13-
"sPrevious": "Предыдущая",
14-
"sNext": "Следующая",
15-
"sLast": "Последняя"
16-
}
2+
"processing": "Подождите...",
3+
"search": "Поиск:",
4+
"lengthMenu": "Показать _MENU_ записей",
5+
"info": "Записи с _START_ до _END_ из _TOTAL_ записей",
6+
"infoEmpty": "Записи с 0 до 0 из 0 записей",
7+
"infoFiltered": "(отфильтровано из _MAX_ записей)",
8+
"infoPostFix": "",
9+
"loadingRecords": "Загрузка записей...",
10+
"zeroRecords": "Записи отсутствуют.",
11+
"emptyTable": "В таблице отсутствуют данные",
12+
"paginate": {
13+
"first": "Первая",
14+
"previous": "Предыдущая",
15+
"next": "Следующая",
16+
"last": "Последняя"
17+
},
18+
"aria": {
19+
"sortAscending": ": активировать для сортировки столбца по возрастанию",
20+
"sortDescending": ": активировать для сортировки столбца по убыванию"
21+
}
1722
}
Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
11
{
2-
"sProcessing": "Procesando...",
3-
"sLengthMenu": "Mostrar _MENU_ registros",
4-
"sZeroRecords": "No se encontraron resultados",
5-
"sInfo": "Mostrando desde _START_ hasta _END_ de _TOTAL_ registros",
6-
"sInfoEmpty": "Mostrando desde 0 hasta 0 de 0 registros",
7-
"sInfoFiltered": "(filtrado de _MAX_ registros en total)",
8-
"sInfoPostFix": "",
9-
"sSearch": "Buscar:",
10-
"sUrl": "",
11-
"oPaginate": {
12-
"sFirst": "Primero",
13-
"sPrevious": "Anterior",
14-
"sNext": "Siguiente",
15-
"sLast": "�ltimo"
16-
}
2+
"sProcessing": "Procesando...",
3+
"sLengthMenu": "Mostrar _MENU_ registros",
4+
"sZeroRecords": "No se encontraron resultados",
5+
"sEmptyTable": "Ningún dato disponible en esta tabla",
6+
"sInfo": "Mostrando registros del _START_ al _END_ de un total de _TOTAL_ registros",
7+
"sInfoEmpty": "Mostrando registros del 0 al 0 de un total de 0 registros",
8+
"sInfoFiltered": "(filtrado de un total de _MAX_ registros)",
9+
"sInfoPostFix": "",
10+
"sSearch": "Buscar:",
11+
"sUrl": "",
12+
"sInfoThousands": ",",
13+
"sLoadingRecords": "Cargando...",
14+
"oPaginate": {
15+
"sFirst": "Primero",
16+
"sLast": "Último",
17+
"sNext": "Siguiente",
18+
"sPrevious": "Anterior"
19+
},
20+
"oAria": {
21+
"sSortAscending": ": Activar para ordenar la columna de manera ascendente",
22+
"sSortDescending": ": Activar para ordenar la columna de manera descendente"
23+
}
1724
}
Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,31 @@
11
{
2-
"sProcessing": "Isleniyor...",
3-
"sLengthMenu": "Sayfada _MENU_ Kayit G�ster",
4-
"sZeroRecords": "Eslesen Kayit Bulunmadi",
5-
"sInfo": " _TOTAL_ Kayittan _START_ - _END_ Arasi Kayitlar",
6-
"sInfoEmpty": "Kayit Yok",
7-
"sInfoFiltered": "( _MAX_ Kayit I�erisinden Bulunan)",
8-
"sInfoPostFix": "",
9-
"sSearch": "Bul:",
10-
"sUrl": "",
11-
"oPaginate": {
12-
"sFirst": "Ilk",
13-
"sPrevious": "�nceki",
14-
"sNext": "Sonraki",
15-
"sLast": "Son"
16-
}
2+
"sDecimal": ",",
3+
"sEmptyTable": "Tabloda herhangi bir veri mevcut değil",
4+
"sInfo": "_TOTAL_ kayıttan _START_ - _END_ arasındaki kayıtlar gösteriliyor",
5+
"sInfoEmpty": "Kayıt yok",
6+
"sInfoFiltered": "(_MAX_ kayıt içerisinden bulunan)",
7+
"sInfoPostFix": "",
8+
"sInfoThousands": ".",
9+
"sLengthMenu": "Sayfada _MENU_ kayıt göster",
10+
"sLoadingRecords": "Yükleniyor...",
11+
"sProcessing": "İşleniyor...",
12+
"sSearch": "Ara:",
13+
"sZeroRecords": "Eşleşen kayıt bulunamadı",
14+
"oPaginate": {
15+
"sFirst": "İlk",
16+
"sLast": "Son",
17+
"sNext": "Sonraki",
18+
"sPrevious": "Önceki"
19+
},
20+
"oAria": {
21+
"sSortAscending": ": artan sütun sıralamasını aktifleştir",
22+
"sSortDescending": ": azalan sütun sıralamasını aktifleştir"
23+
},
24+
"select": {
25+
"rows": {
26+
"_": "%d kayıt seçildi",
27+
"0": "",
28+
"1": "1 kayıt seçildi"
29+
}
30+
}
1731
}

load.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1450,8 +1450,10 @@ function getSelectedValue(id)
14501450
// Show Profile dialog is expected
14511451
if ($("#force_show_dialog").val() === "1") {
14521452
loadProfileDialog();
1453-
}
1453+
}';
14541454

1455+
if (isset($_GET['login']) === true && isset($_GET['key']) === true) {
1456+
$htmlHeaders .= '
14551457
// Send query for password geenration
14561458
$("#but_generate_new_password").click(function() {
14571459
$("#ajax_loader_send_mail").show();
@@ -1473,9 +1475,12 @@ function(data) {
14731475
}
14741476
$("#ajax_loader_send_mail").hide();
14751477
}
1476-
);
1478+
);
14771479
});
1480+
';
1481+
}
14781482

1483+
$htmlHeaders .= '
14791484
setTimeout(function() { NProgress.done(); $(".fade").removeClass("out"); }, 1000);
14801485
});';
14811486

0 commit comments

Comments
 (0)