8 files changed, 35 insertions, 105 deletions
diff --git a/api/pl.treksoft.kvision.i18n/-i18n/gettext.html b/api/pl.treksoft.kvision.i18n/-i18n/gettext.html
index 63ab9b2b..7c2fe669 100644
--- a/api/pl.treksoft.kvision.i18n/-i18n/gettext.html
+++ b/api/pl.treksoft.kvision.i18n/-i18n/gettext.html
@@ -10,6 +10,7 @@
 <h1>gettext</h1>
 <a name="pl.treksoft.kvision.i18n.I18n$gettext(kotlin.String)"></a>
 <code><span class="keyword">fun </span><span class="identifier">gettext</span><span class="symbol">(</span><span class="identifier" id="pl.treksoft.kvision.i18n.I18n$gettext(kotlin.String)/key">key</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a></code>
+<p>Overrides <a href="../-i18n-manager/gettext.html">I18nManager.gettext</a></p>
 <p>A static translation function for a singular form.</p>
 <h3>Parameters</h3>
 <p><a name="key"></a>
diff --git a/api/pl.treksoft.kvision.i18n/-i18n/index.html b/api/pl.treksoft.kvision.i18n/-i18n/index.html
index a6f2f17e..731610c8 100644
--- a/api/pl.treksoft.kvision.i18n/-i18n/index.html
+++ b/api/pl.treksoft.kvision.i18n/-i18n/index.html
@@ -8,7 +8,7 @@
 <a href="../../index.html">kvision</a>&nbsp;/&nbsp;<a href="../index.html">pl.treksoft.kvision.i18n</a>&nbsp;/&nbsp;<a href="./index.html">I18n</a><br/>
 <br/>
 <h1>I18n</h1>
-<code><span class="keyword">object </span><span class="identifier">I18n</span></code>
+<code><span class="keyword">object </span><span class="identifier">I18n</span>&nbsp;<span class="symbol">:</span>&nbsp;<a href="../-i18n-manager/index.html"><span class="identifier">I18nManager</span></a></code>
 <p>A singleton object used for translations.</p>
 <h3>Properties</h3>
 <table>
@@ -22,6 +22,13 @@
 <p>Main language of the application.</p>
 </td>
 </tr>
+<tr>
+<td>
+<p><a href="manager.html">manager</a></p>
+</td>
+<td>
+<code><span class="keyword">var </span><span class="identifier">manager</span><span class="symbol">: </span><a href="../-i18n-manager/index.html"><span class="identifier">I18nManager</span></a></code></td>
+</tr>
 </tbody>
 </table>
 <h3>Functions</h3>
@@ -38,16 +45,6 @@
 </tr>
 <tr>
 <td>
-<p><a href="init.html">init</a></p>
-</td>
-<td>
-<code><span class="keyword">fun </span><span class="identifier">init</span><span class="symbol">(</span><span class="keyword">vararg</span> <span class="identifier" id="pl.treksoft.kvision.i18n.I18n$init(kotlin.Array((kotlin.String)), kotlin.Function0((kotlin.Unit)))/languages">languages</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a><span class="symbol">, </span><span class="identifier" id="pl.treksoft.kvision.i18n.I18n$init(kotlin.Array((kotlin.String)), kotlin.Function0((kotlin.Unit)))/initCallback">initCallback</span><span class="symbol">:</span>&nbsp;<span class="symbol">(</span><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html"><span class="identifier">Unit</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html"><span class="identifier">Unit</span></a></code>
-<p>I18n initialization function.
-Should be called in the main function of the application.</p>
-</td>
-</tr>
-<tr>
-<td>
 <p><a href="ngettext.html">ngettext</a></p>
 </td>
 <td>
@@ -55,31 +52,35 @@ Should be called in the main function of the application.</p>
 <p>A static translation function for a plural form.</p>
 </td>
 </tr>
+</tbody>
+</table>
+<h3>Inherited Functions</h3>
+<table>
+<tbody>
 <tr>
 <td>
-<p><a href="ntr.html">ntr</a></p>
+<p><a href="../-i18n-manager/ntr.html">ntr</a></p>
 </td>
 <td>
-<code><span class="keyword">fun </span><span class="identifier">ntr</span><span class="symbol">(</span><span class="identifier" id="pl.treksoft.kvision.i18n.I18n$ntr(kotlin.String, kotlin.String, kotlin.Int)/singularKey">singularKey</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a><span class="symbol">, </span><span class="identifier" id="pl.treksoft.kvision.i18n.I18n$ntr(kotlin.String, kotlin.String, kotlin.Int)/pluralKey">pluralKey</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a><span class="symbol">, </span><span class="identifier" id="pl.treksoft.kvision.i18n.I18n$ntr(kotlin.String, kotlin.String, kotlin.Int)/value">value</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html"><span class="identifier">Int</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a></code>
+<code><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">ntr</span><span class="symbol">(</span><span class="identifier" id="pl.treksoft.kvision.i18n.I18nManager$ntr(kotlin.String, kotlin.String, kotlin.Int)/singularKey">singularKey</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a><span class="symbol">, </span><span class="identifier" id="pl.treksoft.kvision.i18n.I18nManager$ntr(kotlin.String, kotlin.String, kotlin.Int)/pluralKey">pluralKey</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a><span class="symbol">, </span><span class="identifier" id="pl.treksoft.kvision.i18n.I18nManager$ntr(kotlin.String, kotlin.String, kotlin.Int)/value">value</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html"><span class="identifier">Int</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a></code>
 <p>A dynamic translation function for a plural form.</p>
 </td>
 </tr>
 <tr>
 <td>
-<p><a href="tr.html">tr</a></p>
+<p><a href="../-i18n-manager/tr.html">tr</a></p>
 </td>
 <td>
-<code><span class="keyword">fun </span><span class="identifier">tr</span><span class="symbol">(</span><span class="identifier" id="pl.treksoft.kvision.i18n.I18n$tr(kotlin.String)/key">key</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a></code>
+<code><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">tr</span><span class="symbol">(</span><span class="identifier" id="pl.treksoft.kvision.i18n.I18nManager$tr(kotlin.String)/key">key</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a></code>
 <p>A dynamic translation function for a singular form.</p>
 </td>
 </tr>
 <tr>
 <td>
-<p><a href="trans.html">trans</a></p>
+<p><a href="../-i18n-manager/trans.html">trans</a></p>
 </td>
 <td>
-<code><span class="keyword">fun </span><span class="identifier">trans</span><span class="symbol">(</span><span class="identifier" id="pl.treksoft.kvision.i18n.I18n$trans(kotlin.String)/text">text</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a></code><br/>
-<code><span class="keyword">fun </span><span class="identifier">trans</span><span class="symbol">(</span><span class="identifier" id="pl.treksoft.kvision.i18n.I18n$trans(kotlin.String)/text">text</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a><span class="symbol">?</span><span class="symbol">)</span><span class="symbol">: </span><a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a><span class="symbol">?</span></code>
+<code><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">trans</span><span class="symbol">(</span><span class="identifier" id="pl.treksoft.kvision.i18n.I18nManager$trans(kotlin.String)/text">text</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a><span class="symbol">?</span><span class="symbol">)</span><span class="symbol">: </span><a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a><span class="symbol">?</span></code>
 <p>A dynamic translation function.</p>
 </td>
 </tr>
diff --git a/api/pl.treksoft.kvision.i18n/-i18n/init.html b/api/pl.treksoft.kvision.i18n/-i18n/init.html
deleted file mode 100644
index 6e460023..00000000
--- a/api/pl.treksoft.kvision.i18n/-i18n/init.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<HTML>
-<HEAD>
-<meta charset="UTF-8">
-<title>I18n.init - kvision</title>
-<link rel="stylesheet" href="../../../style.css">
-</HEAD>
-<BODY>
-<a href="../../index.html">kvision</a>&nbsp;/&nbsp;<a href="../index.html">pl.treksoft.kvision.i18n</a>&nbsp;/&nbsp;<a href="index.html">I18n</a>&nbsp;/&nbsp;<a href="./init.html">init</a><br/>
-<br/>
-<h1>init</h1>
-<a name="pl.treksoft.kvision.i18n.I18n$init(kotlin.Array((kotlin.String)), kotlin.Function0((kotlin.Unit)))"></a>
-<code><span class="keyword">fun </span><span class="identifier">init</span><span class="symbol">(</span><span class="keyword">vararg</span> <span class="identifier" id="pl.treksoft.kvision.i18n.I18n$init(kotlin.Array((kotlin.String)), kotlin.Function0((kotlin.Unit)))/languages">languages</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a><span class="symbol">, </span><span class="identifier" id="pl.treksoft.kvision.i18n.I18n$init(kotlin.Array((kotlin.String)), kotlin.Function0((kotlin.Unit)))/initCallback">initCallback</span><span class="symbol">:</span>&nbsp;<span class="symbol">(</span><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html"><span class="identifier">Unit</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html"><span class="identifier">Unit</span></a></code>
-<p>I18n initialization function.
-Should be called in the main function of the application.</p>
-<h3>Parameters</h3>
-<p><a name="languages"></a>
-<code>languages</code> - a list of supported languages.</p>
-<p><a name="initCallback"></a>
-<code>initCallback</code> - a code to run after the initialization process is complete.</p>
-</BODY>
-</HTML>
diff --git a/api/pl.treksoft.kvision.i18n/-i18n/manager.html b/api/pl.treksoft.kvision.i18n/-i18n/manager.html
new file mode 100644
index 00000000..e5426015
--- /dev/null
+++ b/api/pl.treksoft.kvision.i18n/-i18n/manager.html
@@ -0,0 +1,14 @@
+<HTML>
+<HEAD>
+<meta charset="UTF-8">
+<title>I18n.manager - kvision</title>
+<link rel="stylesheet" href="../../../style.css">
+</HEAD>
+<BODY>
+<a href="../../index.html">kvision</a>&nbsp;/&nbsp;<a href="../index.html">pl.treksoft.kvision.i18n</a>&nbsp;/&nbsp;<a href="index.html">I18n</a>&nbsp;/&nbsp;<a href="./manager.html">manager</a><br/>
+<br/>
+<h1>manager</h1>
+<a name="pl.treksoft.kvision.i18n.I18n$manager"></a>
+<code><span class="keyword">var </span><span class="identifier">manager</span><span class="symbol">: </span><a href="../-i18n-manager/index.html"><span class="identifier">I18nManager</span></a></code>
+</BODY>
+</HTML>
diff --git a/api/pl.treksoft.kvision.i18n/-i18n/ngettext.html b/api/pl.treksoft.kvision.i18n/-i18n/ngettext.html
index 091efe53..8ad75407 100644
--- a/api/pl.treksoft.kvision.i18n/-i18n/ngettext.html
+++ b/api/pl.treksoft.kvision.i18n/-i18n/ngettext.html
@@ -10,6 +10,7 @@
 <h1>ngettext</h1>
 <a name="pl.treksoft.kvision.i18n.I18n$ngettext(kotlin.String, kotlin.String, kotlin.Int)"></a>
 <code><span class="keyword">fun </span><span class="identifier">ngettext</span><span class="symbol">(</span><span class="identifier" id="pl.treksoft.kvision.i18n.I18n$ngettext(kotlin.String, kotlin.String, kotlin.Int)/singularKey">singularKey</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a><span class="symbol">, </span><span class="identifier" id="pl.treksoft.kvision.i18n.I18n$ngettext(kotlin.String, kotlin.String, kotlin.Int)/pluralKey">pluralKey</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a><span class="symbol">, </span><span class="identifier" id="pl.treksoft.kvision.i18n.I18n$ngettext(kotlin.String, kotlin.String, kotlin.Int)/value">value</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html"><span class="identifier">Int</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a></code>
+<p>Overrides <a href="../-i18n-manager/ngettext.html">I18nManager.ngettext</a></p>
 <p>A static translation function for a plural form.</p>
 <h3>Parameters</h3>
 <p><a name="singularKey"></a>
diff --git a/api/pl.treksoft.kvision.i18n/-i18n/ntr.html b/api/pl.treksoft.kvision.i18n/-i18n/ntr.html
deleted file mode 100644
index 958d3c0d..00000000
--- a/api/pl.treksoft.kvision.i18n/-i18n/ntr.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<HTML>
-<HEAD>
-<meta charset="UTF-8">
-<title>I18n.ntr - kvision</title>
-<link rel="stylesheet" href="../../../style.css">
-</HEAD>
-<BODY>
-<a href="../../index.html">kvision</a>&nbsp;/&nbsp;<a href="../index.html">pl.treksoft.kvision.i18n</a>&nbsp;/&nbsp;<a href="index.html">I18n</a>&nbsp;/&nbsp;<a href="./ntr.html">ntr</a><br/>
-<br/>
-<h1>ntr</h1>
-<a name="pl.treksoft.kvision.i18n.I18n$ntr(kotlin.String, kotlin.String, kotlin.Int)"></a>
-<code><span class="keyword">fun </span><span class="identifier">ntr</span><span class="symbol">(</span><span class="identifier" id="pl.treksoft.kvision.i18n.I18n$ntr(kotlin.String, kotlin.String, kotlin.Int)/singularKey">singularKey</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a><span class="symbol">, </span><span class="identifier" id="pl.treksoft.kvision.i18n.I18n$ntr(kotlin.String, kotlin.String, kotlin.Int)/pluralKey">pluralKey</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a><span class="symbol">, </span><span class="identifier" id="pl.treksoft.kvision.i18n.I18n$ntr(kotlin.String, kotlin.String, kotlin.Int)/value">value</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html"><span class="identifier">Int</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a></code>
-<p>A dynamic translation function for a plural form.</p>
-<h3>Parameters</h3>
-<p><a name="singularKey"></a>
-<code>singularKey</code> - a translation key for a singular form.</p>
-<p><a name="pluralKey"></a>
-<code>pluralKey</code> - a translation key for a plural form.</p>
-<p><a name="value"></a>
-<code>value</code> - a count value.</p>
-<p><strong>Return</strong><br/>
-text marked for a dynamic translation.</p>
-</BODY>
-</HTML>
diff --git a/api/pl.treksoft.kvision.i18n/-i18n/tr.html b/api/pl.treksoft.kvision.i18n/-i18n/tr.html
deleted file mode 100644
index f419b8b9..00000000
--- a/api/pl.treksoft.kvision.i18n/-i18n/tr.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HTML>
-<HEAD>
-<meta charset="UTF-8">
-<title>I18n.tr - kvision</title>
-<link rel="stylesheet" href="../../../style.css">
-</HEAD>
-<BODY>
-<a href="../../index.html">kvision</a>&nbsp;/&nbsp;<a href="../index.html">pl.treksoft.kvision.i18n</a>&nbsp;/&nbsp;<a href="index.html">I18n</a>&nbsp;/&nbsp;<a href="./tr.html">tr</a><br/>
-<br/>
-<h1>tr</h1>
-<a name="pl.treksoft.kvision.i18n.I18n$tr(kotlin.String)"></a>
-<code><span class="keyword">fun </span><span class="identifier">tr</span><span class="symbol">(</span><span class="identifier" id="pl.treksoft.kvision.i18n.I18n$tr(kotlin.String)/key">key</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a></code>
-<p>A dynamic translation function for a singular form.</p>
-<h3>Parameters</h3>
-<p><a name="key"></a>
-<code>key</code> - a translation key.</p>
-<p><strong>Return</strong><br/>
-text marked for a dynamic translation.</p>
-</BODY>
-</HTML>
diff --git a/api/pl.treksoft.kvision.i18n/-i18n/trans.html b/api/pl.treksoft.kvision.i18n/-i18n/trans.html
deleted file mode 100644
index f7fdb811..00000000
--- a/api/pl.treksoft.kvision.i18n/-i18n/trans.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<HTML>
-<HEAD>
-<meta charset="UTF-8">
-<title>I18n.trans - kvision</title>
-<link rel="stylesheet" href="../../../style.css">
-</HEAD>
-<BODY>
-<a href="../../index.html">kvision</a>&nbsp;/&nbsp;<a href="../index.html">pl.treksoft.kvision.i18n</a>&nbsp;/&nbsp;<a href="index.html">I18n</a>&nbsp;/&nbsp;<a href="./trans.html">trans</a><br/>
-<br/>
-<h1>trans</h1>
-<a name="pl.treksoft.kvision.i18n.I18n$trans(kotlin.String)"></a>
-<code><span class="keyword">fun </span><span class="identifier">trans</span><span class="symbol">(</span><span class="identifier" id="pl.treksoft.kvision.i18n.I18n$trans(kotlin.String)/text">text</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a></code><br/>
-<a name="pl.treksoft.kvision.i18n.I18n$trans(kotlin.String)"></a>
-<code><span class="keyword">fun </span><span class="identifier">trans</span><span class="symbol">(</span><span class="identifier" id="pl.treksoft.kvision.i18n.I18n$trans(kotlin.String)/text">text</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a><span class="symbol">?</span><span class="symbol">)</span><span class="symbol">: </span><a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a><span class="symbol">?</span></code>
-<p>A dynamic translation function.</p>
-<h3>Parameters</h3>
-<p><a name="text"></a>
-<code>text</code> - text marked for a dynamic translation.</p>
-<p><strong>Return</strong><br/>
-translated text.</p>
-</BODY>
-</HTML>