Skip to content

Commit

Permalink
Merge branch 'release/v8.0.0' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
maxkadushkin committed Dec 31, 2023
2 parents 254e8c5 + cde337e commit 1aff2b0
Show file tree
Hide file tree
Showing 194 changed files with 10,350 additions and 5,187 deletions.
47 changes: 47 additions & 0 deletions common/changes/8.0.0/changes.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<h1>ONLYOFFICE Desktop Editors 8.0.0<span class="releasedate"> - {{DATE}}</span></h1>

<h2>New Features</h2>

<h4>All Editors</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Document Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Spreadsheet Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Presentation Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Forms</h4>
<ul>
<li>TODO</li>
</ul>

<h2>Fixes</h2>

<h4>All Editors</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Document Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Spreadsheet Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Presentation Editor</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Forms</h4>
<ul>
<li>TODO</li>
</ul>
47 changes: 47 additions & 0 deletions common/changes/8.0.0/changes_ru.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<h1>ONLYOFFICE Desktop Editors 8.0.0<span class="releasedate"> - {{DATE}}</span></h1>

<h2>Новые функции</h2>

<h4>Все редакторы</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор документов</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор таблиц</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор презентаций</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Формы</h4>
<ul>
<li>TODO</li>
</ul>

<h2>Исправления</h2>

<h4>Все редакторы</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор документов</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор таблиц</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Редактор презентаций</h4>
<ul>
<li>TODO</li>
</ul>
<h4>Формы</h4>
<ul>
<li>TODO</li>
</ul>
11 changes: 11 additions & 0 deletions common/loginpage/locale/be.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ l10n.be = {
actActivate: 'Актываваць',
actAbout: 'Пра праграму',
actSettings: 'Налады',
actTemplates: 'Шаблоны',
licKeyHolder: 'ключ актывацыі ўводу',
btnActivate: 'Актываваць',
licGetLicense: 'Атрымаць ключ актывацыі',
Expand Down Expand Up @@ -92,9 +93,19 @@ l10n.be = {
settOptLaunchInWindow: 'У акне',
settSpellcheckDetection: 'Выяўленне мовы правапісу',
settOptDisabled: 'Адключана',
settOptEnabled: 'Уключана',
aboutChangelog: 'Спіс зменаў',
updateNoUpdates: 'Праграма абноўленая',
updateAvialable: 'Даступна версія $1. Пстрыкніце, каб спампаваць.',
settOptThemeSystem: 'Сістэмная',
settOptThemeContrastDark: 'Кантрасная цёмная',
settAUpdateMode: 'Рэжым аўтаабнаўлення',
settOptAUpdateSilent: 'Ціхі рэжым',
settOptAUpdateAsk: 'Папрасіць спампаваць',
updateDownloadFinished: 'Спампоўка скончана. Націсніце, каб усталяваць',
updateDownloadCanceled: 'Спампоўка скасавана',
updateDownloadProgress: 'Спампоўка $1%. Націсніце, каб спыніць',
settOptDescDisabled: "Аўтаматычная праверка абнаўленняў будзе адключана",
settOptDescAUpdateSilent: "Спампоўваць абнаўленні і пытацца перад уста-ноўкай",
settOptDescAUpdateAsk: "Вы будзеце ведаць пра ўсе этапы абнаўлення",
}
2 changes: 1 addition & 1 deletion common/loginpage/locale/de.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ l10n.de = {
updateAvialable: 'Version $1 ist verfügbar. Klicken Sie hier zum Herunterladen.',
settOptThemeSystem: 'Wie im System',
settOptThemeContrastDark: 'Dunkler Kontrast',
settAUpdateMode: 'utomatische Aktualisierung',
settAUpdateMode: 'Automatische Aktualisierung',
settOptAUpdateSilent: 'Lautlos',
settOptAUpdateAsk: 'Anfrage zum Herunterladen',
updateDownloadFinished: 'Herunterladen abgeschlossen. Für Installation hier klicken',
Expand Down
18 changes: 18 additions & 0 deletions common/loginpage/locale/ga.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ l10n.ga = {
actActivate: 'Gníomhachtaigh',
actAbout: 'Faoi',
actSettings: 'Socruithe',
actTemplates: 'Teimpléid',
licKeyHolder: 'eochair gníomhachtaithe ionchuir',
btnActivate: 'Gníomhachtaigh',
licGetLicense: 'Faigh ceadúnas anois',
Expand Down Expand Up @@ -90,4 +91,21 @@ l10n.ga = {
settOptLaunchMode: 'Oscail comhad',
settOptLaunchInTab: 'Sa chluaisín',
settOptLaunchInWindow: 'I bhfuinneog',
settSpellcheckDetection: 'Brath teanga litrithe',
settOptDisabled: 'Díchumasaithe',
settOptEnabled: 'Cumasaithe',
aboutChangelog: 'Changelog',
updateNoUpdates: 'Aip suas chun dáta',
updateAvialable: 'Tá leagan $1 ar fáil. Cliceáil le híoslódáil.',
settOptThemeSystem: 'Córas mar in gcéanna',
settOptThemeContrastDark: 'Codarsnacht dorcha',
settAUpdateMode: 'Mód uath-nuashonraithe',
settOptAUpdateSilent: 'Mód chiúin',
settOptAUpdateAsk: 'Iarr chun íoslódáil',
updateDownloadFinished: 'Críochnaithe ag íoslódáil. Cliceáil chun suiteáil',
updateDownloadCanceled: 'Cealaíodh an íoslódáil',
updateDownloadProgress: '$1% á íoslódáil. Cliceáil chun stop a chur leis',
settOptDescDisabled: "Díchumasófar nuashonruithe atá le uathsheiceáil",
settOptDescAUpdateSilent: "Íoslódáil na nuashonruithe agus fiafraigh roimh iad a shuiteáil",
settOptDescAUpdateAsk: "Cuirfear ar an eolas thú faoi gach céim nuashonruithe",
}
17 changes: 17 additions & 0 deletions common/loginpage/locale/lt.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,21 @@ l10n.lt = {
settOptLaunchMode: 'Atidayti failą',
settOptLaunchInTab: 'Skirtuke',
settOptLaunchInWindow: 'Lange',
settSpellcheckDetection: 'Rašymo kalbos aptikimas',
settOptDisabled: 'Išjungtas',
settOptEnabled: 'Įjungtas',
aboutChangelog: 'Pakeitimų sąrašas',
updateNoUpdates: 'Programa atnaujinta',
updateAvialable: 'Galima versija už 1 JAV dolerį. Spustelėkite norėdami atsisiųsti.',
settOptThemeSystem: 'Tokia pati kaip sistema',
settOptThemeContrastDark: 'Tamsus kontrastas',
settAUpdateMode: 'Automatinio atnaujinimo režimas',
settOptAUpdateSilent: 'Tylusis režimas',
settOptAUpdateAsk: 'Prašyti atsisiųsti',
updateDownloadFinished: 'Atsisiuntimas baigtas. Spustelėkite kad įdiegtumėte',
updateDownloadCanceled: 'DAtsisiuntimas atšauktas',
updateDownloadProgress: 'Atsisiunčiama 1%. Spustelėkite, jei norite sustabdyti',
settOptDescDisabled: "Automatinis naujinimų tikrinimas bus išjungtas",
settOptDescAUpdateSilent: "Atsisiųsti naujinimus ir klausti prieš įdiegiant",
settOptDescAUpdateAsk: "Jums bus pranešta apie visus atnaujinimo žingsnius",
}
32 changes: 23 additions & 9 deletions common/loginpage/noconnect/code.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
{

!window.l10n && (window.l10n = {boxNoConnect:{}});
!window.l10n.boxNoConnect && (window.l10n.boxNoConnect = {});
Expand All @@ -7,8 +7,12 @@ const langs = {
en: {
msgNoConn: 'Internet connection failed...',
msgNoConnDesc: 'Check connection',
msgFileNoConn: 'Check your internet connection',
msgFileNoConnDesc: "You are unable to edit the document because the Internet connection is lost or restricted. Please check your connection and re-open the document to continue.",
msgTemplatesNoConn: 'Check your internet connection',
msgTemplatesNoConnDesc: "Couldn't load this section because you are experiencing possible network issues. Please check your internet connection and try again.",
msgFileError: 'Oops! Something went wrong',
msgFileErrorDesc: "We lost access to your file due to a lack of memory or some other reason. Please don't worry and try reopening the file. Close this tab to continue",
}
}

Expand All @@ -18,6 +22,13 @@ const error_box = function() {
return (l10n.boxNoConnect[l] && l10n.boxNoConnect[l][n]) || langs.en[n];
}

const page_t10s = {
"def": ["msgNoConn", "msgNoConnDesc"],
"cloudfile": ["msgFileNoConn", "msgFileNoConnDesc"],
"templates": ["msgTemplatesNoConn", "msgTemplatesNoConnDesc"],
"fileerr": ["msgFileError", "msgFileErrorDesc"],
};

const _fix_lang = l => {
if ( l && l10n && l10n.boxNoConnect ) {
if ( l10n.boxNoConnect[l])
Expand Down Expand Up @@ -45,23 +56,26 @@ const error_box = function() {
if ( !args.parent ) args.parent = document.body;
args.parent.insertAdjacentHTML('beforeend', html_);

_page = args.page;
_page = args.page || 'def';
this.translate(args.lang);
},
translate: function(lang) {
const page = !page_t10s[_page] ? 'def' : _page;
lang = _fix_lang(lang);

const ms = document.getElementById("idx-msg-short");
if ( ms ) ms.innerText = _tr("msgNoConn", lang);
if ( ms ) ms.innerText = _tr(page_t10s[page][0], lang);

const ml = document.getElementById("idx-msg-long");
if ( ml ) {
if ( _page == 'file' )
ml.innerText = _tr("msgFileNoConnDesc", lang);
else
if ( _page == 'templates')
ml.innerText = _tr("msgTemplatesNoConnDesc", lang);
else ml.innerText = _tr("msgNoConnDesc", lang);
ml.innerText = _tr(page_t10s[page][1], lang);

// if ( _page == 'file' ) {
// ml.innerText = _tr("msgFileNoConnDesc", lang);
// } else
// if ( _page == 'templates') {
// ml.innerText = _tr("msgTemplatesNoConnDesc", lang);
// } else ml.innerText = _tr("msgNoConnDesc", lang);
}
},
}
Expand Down
Loading

0 comments on commit 1aff2b0

Please sign in to comment.