From ac733092ccc084475c2dbd90738b97c7487b3b43 Mon Sep 17 00:00:00 2001 From: lkrsnik Date: Thu, 25 Jul 2024 09:29:10 +0200 Subject: [PATCH] Fixed translations + Resizing line overlap + Disabled No type + Reorganized settings + Other fixes --- app.py | 53 +++++++- messages.pot | 148 +++++++++++---------- static/js/init.js | 38 ++++++ templates/index.html | 69 +++++----- templates/result.html | 6 +- translations/en/LC_MESSAGES/messages.mo | Bin 5677 -> 5713 bytes translations/en/LC_MESSAGES/messages.po | 159 ++++++++++++----------- translations/sl/LC_MESSAGES/messages.mo | Bin 7147 -> 7009 bytes translations/sl/LC_MESSAGES/messages.po | 163 ++++++++++++------------ 9 files changed, 354 insertions(+), 282 deletions(-) diff --git a/app.py b/app.py index 2b23638..51c709a 100755 --- a/app.py +++ b/app.py @@ -31,6 +31,42 @@ def get_locale(): return DEFAULT_LANGUAGE +def ilog(n, base): + """ + Find the integer log of n with respect to the base. + + >>> import math + >>> for base in range(2, 16 + 1): + ... for n in range(1, 1000): + ... assert ilog(n, base) == int(math.log(n, base) + 1e-10), '%s %s' % (n, base) + """ + count = 0 + while n >= base: + count += 1 + n //= base + return count + + +def sci_notation(n, prec=2): + """ + Represent n in scientific notation, with the specified precision. + + >>> sci_notation(1234 * 10**1000) + '1.234e+1003' + >>> sci_notation(10**1000 // 2, prec=1) + '5.0e+999' + """ + if -100000 < n < 100000: + return str(n) + + if n < 0: + return "-" + sci_notation(-n, prec=prec) + base = 10 + exponent = ilog(n, base) + mantissa = n / base**exponent + return '{0:.{1}f}e{2:+d}'.format(mantissa, prec, exponent) + + def create_app(): app = Flask(__name__, static_url_path='/stark/static') @@ -50,7 +86,7 @@ def create_app(): # mandatory parameters with default value configs['internal_saves'] = './internal_saves' - configs['cpu_cores'] = 12 + configs['cpu_cores'] = 1 configs['complete_tree_type'] = True configs['dependency_type'] = True configs['node_order'] = True @@ -150,12 +186,19 @@ def create_app(): for j, v in enumerate(row): content_dict[head[j]].append(v) - displayed_head = [v for k, v in table_columns2displayed_table_columns.items() if k in head] + head = [(k, v) for k, v in table_columns2displayed_table_columns.items() if k in head] displayed_content_dict = {} - for h in displayed_head: - displayed_content_dict[h] = content_dict[displayed_table_columns2table_columns[h]] + for f_h, h in head: + if f_h == '%DIFF' or f_h == 'OR': + # for num_str in content_dict[displayed_table_columns2table_columns[h]]: + # if n < 0: + # return "-" + sci_notation(-n, prec=prec) + # sci_notation(eval(num)) + displayed_content_dict[f_h] = [sci_notation(eval(n)) for n in content_dict[displayed_table_columns2table_columns[h]]] + else: + displayed_content_dict[f_h] = content_dict[displayed_table_columns2table_columns[h]] - return render_template('result.html', head_row=displayed_head, content=displayed_content_dict) + return render_template('result.html', head=head, content=displayed_content_dict) @app.route('/stark/', methods=['GET', 'POST']) # @headers({'Cache-Control': 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0'}) diff --git a/messages.pot b/messages.pot index 72f92bf..65f4c1a 100644 --- a/messages.pot +++ b/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-07-04 11:51+0200\n" +"POT-Creation-Date: 2024-07-23 14:29+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,113 +17,113 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.14.0\n" -#: app.py:108 +#: app.py:144 msgid "Tree" msgstr "" -#: app.py:109 +#: app.py:145 msgid "Frequency" msgstr "" -#: app.py:110 +#: app.py:146 msgid "Frequency in B" msgstr "" -#: app.py:111 +#: app.py:147 msgid "Order" msgstr "" -#: app.py:112 +#: app.py:148 msgid "Number of nodes" msgstr "" -#: app.py:113 +#: app.py:149 msgid "Head node" msgstr "" -#: app.py:114 +#: app.py:150 msgid "Grew-match URL" msgstr "" -#: app.py:115 +#: app.py:151 msgid "Ratio" msgstr "" -#: app.py:116 +#: app.py:152 msgid "%DIFF" msgstr "" -#: app.py:117 +#: app.py:153 msgid "OR" msgstr "" -#: app.py:118 +#: app.py:154 msgid "BIC" msgstr "" -#: app.py:119 +#: app.py:155 msgid "MI" msgstr "" -#: app.py:120 +#: app.py:156 msgid "logDice" msgstr "" -#: app.py:121 +#: app.py:157 msgid "t-score" msgstr "" -#: app.py:124 +#: app.py:160 msgid "Frequency in A" msgstr "" -#: app.py:188 app.py:189 +#: app.py:231 app.py:232 msgid "Please insert either input url or file, not both of them." msgstr "" -#: app.py:199 app.py:280 +#: app.py:242 app.py:323 msgid "Incorrect URL!" msgstr "" -#: app.py:201 app.py:202 +#: app.py:244 app.py:245 msgid "Please insert either input url or provide a file." msgstr "" -#: app.py:210 +#: app.py:253 msgid "Please select at least one node type." msgstr "" -#: app.py:215 +#: app.py:258 msgid "Node option" msgstr "" -#: app.py:215 +#: app.py:258 msgid "is not supported. Please enter valid options." msgstr "" -#: app.py:268 app.py:269 +#: app.py:311 app.py:312 msgid "Please insert either compare url or file, not both of them." msgstr "" -#: app.py:292 +#: app.py:335 msgid "Please insert an Integer." msgstr "" -#: app.py:317 +#: app.py:360 msgid "" "Processing failed! Please recheck your settings, e.g. input format or " "head node description." msgstr "" -#: app.py:326 +#: app.py:369 msgid "Frequency " msgstr "" -#: app.py:326 +#: app.py:369 msgid "Frequency in A " msgstr "" -#: app.py:327 templates/base.html:20 templates/base.html:22 +#: app.py:370 templates/base.html:20 templates/base.html:22 #: templates/index.html:8 templates/result.html:15 msgid "code" msgstr "" @@ -208,19 +208,19 @@ msgstr "" msgid "Upload a treebank" msgstr "" -#: templates/index.html:12 templates/index.html:20 templates/index.html:171 -#: templates/index.html:178 +#: templates/index.html:12 templates/index.html:20 templates/index.html:173 +#: templates/index.html:180 msgid "in CONLL-U format" msgstr "" -#: templates/index.html:12 templates/index.html:44 templates/index.html:48 -#: templates/index.html:94 templates/index.html:109 templates/index.html:125 -#: templates/index.html:131 templates/index.html:137 templates/index.html:143 -#: templates/index.html:151 templates/index.html:170 templates/index.html:171 +#: templates/index.html:12 templates/index.html:46 templates/index.html:50 +#: templates/index.html:96 templates/index.html:111 templates/index.html:127 +#: templates/index.html:133 templates/index.html:139 templates/index.html:145 +#: templates/index.html:153 templates/index.html:172 templates/index.html:173 msgid "Help" msgstr "" -#: templates/index.html:15 templates/index.html:174 +#: templates/index.html:15 templates/index.html:176 msgid "Browse" msgstr "" @@ -228,145 +228,141 @@ msgstr "" msgid "Upload" msgstr "" -#: templates/index.html:29 templates/index.html:188 +#: templates/index.html:29 templates/index.html:190 msgid "Or" msgstr "" -#: templates/index.html:29 templates/index.html:188 +#: templates/index.html:29 templates/index.html:190 msgid "insert a URL link to a treebank in CONLL-U format" msgstr "" -#: templates/index.html:29 templates/index.html:188 -msgid "Example" -msgstr "" - -#: templates/index.html:38 +#: templates/index.html:40 msgid "Tree specification" msgstr "" -#: templates/index.html:44 +#: templates/index.html:46 msgid "Tree size" msgstr "" -#: templates/index.html:44 +#: templates/index.html:46 msgid "number of tokens in the tree" msgstr "" -#: templates/index.html:48 +#: templates/index.html:50 msgid "Node type" msgstr "" -#: templates/index.html:48 +#: templates/index.html:50 msgid "token characteristics to consider" msgstr "" -#: templates/index.html:54 -msgid "No type" -msgstr "" - -#: templates/index.html:63 +#: templates/index.html:56 msgid "Part-of-speech" msgstr "" -#: templates/index.html:69 +#: templates/index.html:62 msgid "Lemma" msgstr "" -#: templates/index.html:75 +#: templates/index.html:68 msgid "Form" msgstr "" -#: templates/index.html:89 +#: templates/index.html:74 +msgid "No type" +msgstr "" + +#: templates/index.html:91 msgid "Advanced settings" msgstr "" -#: templates/index.html:94 +#: templates/index.html:96 msgid "Labeled trees" msgstr "" -#: templates/index.html:94 +#: templates/index.html:96 msgid "include names of dependency relations" msgstr "" -#: templates/index.html:98 templates/index.html:113 templates/index.html:155 +#: templates/index.html:100 templates/index.html:115 templates/index.html:157 msgid "No" msgstr "" -#: templates/index.html:101 templates/index.html:116 templates/index.html:158 +#: templates/index.html:103 templates/index.html:118 templates/index.html:160 msgid "Yes" msgstr "" -#: templates/index.html:109 +#: templates/index.html:111 msgid "Fixed order" msgstr "" -#: templates/index.html:109 +#: templates/index.html:111 msgid "differentiate trees based on surface word order" msgstr "" -#: templates/index.html:125 +#: templates/index.html:127 msgid "Head" msgstr "" -#: templates/index.html:125 +#: templates/index.html:127 msgid "specify potential restrictions on the head node" msgstr "" -#: templates/index.html:131 +#: templates/index.html:133 msgid "Ignored labels" msgstr "" -#: templates/index.html:131 +#: templates/index.html:133 msgid "specify the dependency labels of nodes to be ignored" msgstr "" -#: templates/index.html:137 +#: templates/index.html:139 msgid "Query" msgstr "" -#: templates/index.html:137 +#: templates/index.html:139 msgid "write a query. Note: Tree size attribute will be ignored!" msgstr "" -#: templates/index.html:143 +#: templates/index.html:145 msgid "Frequency threshold" msgstr "" -#: templates/index.html:143 +#: templates/index.html:145 msgid "specify the minimum frequency of a tree in the treebank" msgstr "" -#: templates/index.html:151 +#: templates/index.html:153 msgid "Association measures" msgstr "" -#: templates/index.html:151 +#: templates/index.html:153 msgid "print MI, logDice and t-score" msgstr "" -#: templates/index.html:166 +#: templates/index.html:168 msgid "Compare treebanks" msgstr "" -#: templates/index.html:170 +#: templates/index.html:172 msgid "" "Select a reference treebank to identify key phenomena (prints the " "%DIFF, BIC and OR keyness scores)." msgstr "" -#: templates/index.html:171 templates/index.html:178 +#: templates/index.html:173 templates/index.html:180 msgid "Upload a compare corpus" msgstr "" -#: templates/index.html:202 +#: templates/index.html:206 msgid "Submit" msgstr "" -#: templates/index.html:210 +#: templates/index.html:214 msgid "No results" msgstr "" -#: templates/index.html:211 +#: templates/index.html:215 msgid "Processing with your settings didnt produce any results!" msgstr "" diff --git a/static/js/init.js b/static/js/init.js index 3db4594..97ada72 100644 --- a/static/js/init.js +++ b/static/js/init.js @@ -33,13 +33,24 @@ function readValuesFromLocalstorage() { if (inputName === 'frequency_threshold' && text_val === null) { text_val = '1' } + if (inputName === 'display_size' && text_val === null) { + text_val = '1-10' + } inputElement.val(text_val); } else if (inputType === 'checkbox') { + console.log('aaa') var check_value = localStorage.getItem(inputName); if (check_value !== null) { inputElement.prop('checked', check_value === 'true'); } + if (inputName === 'node_type_none' && check_value === null) { + $('input.association_measures').prop('disabled', true); + $('input.association_measures').prop('checked', false); + } else if(inputName === 'node_type_none' && check_value == 'true') { + $('input.association_measures').prop('disabled', true); + $('input.association_measures').prop('checked', false); + } } } @@ -85,6 +96,23 @@ document.addEventListener("DOMContentLoaded", function(event) { } }); +function adjustLabelPosition() { + $('.dynamic-height').each(function() { + var $label = $(this).find('label'); + var $input = $(this).find('input'); + + // Get the original top and left positions + var originalTop = parseFloat($label.css('top')); + var labelHeight = parseFloat($label.css('height')); + var labelLineHeight = parseFloat($label.css('line-height')); + var heightDelta = (Math.floor(labelHeight / labelLineHeight) - 1) * labelLineHeight; + + $label.css({ + top: -heightDelta + }); + }); +} + (function($){ $(function(){ @@ -143,19 +171,29 @@ document.addEventListener("DOMContentLoaded", function(event) { $('input.node_type').on('change', function(e) { if (this.name == 'node_type_none') { $('input.node_type').not(this).prop('checked', false); + $('input.association_measures').prop('disabled', true); + $('input.association_measures').prop('checked', false); } else { $('input.node_type_none').prop('checked', false); + $('input.association_measures').prop('disabled', false); } }); $('a.example-input-link').click(function(e) { $('#input_url').val(this.href) + $('label[for="input_url"]').addClass('active') e.preventDefault(); }); $('a.example-compare-link').click(function(e) { $('#compare_url').val(this.href) + $('label[for="compare_url"]').addClass('active') e.preventDefault(); }); + // Initial adjustment + adjustLabelPosition(); + + // Adjust on window resize + $(window).resize(adjustLabelPosition); })(jQuery); diff --git a/templates/index.html b/templates/index.html index 10ef92c..261e5f9 100644 --- a/templates/index.html +++ b/templates/index.html @@ -24,11 +24,11 @@
-
+
- + {% if 'input_url' in validation %} {% endif %} @@ -40,25 +40,9 @@
{{ _('Tree specification') }}
-
-
- - -
-
-
-
- -
+
+ +
{% if 'node_type' in validation %}
@@ -85,12 +78,6 @@ {% endif %}
-
-
-
-
add {{ _('Advanced settings') }}
-
-
@@ -121,26 +108,38 @@
+
+
+
+
add {{ _('Advanced settings') }}
+
+
-
+
-
+
-
+
+ + +
+
+
+
-
+
{% if 'frequency_threshold' in validation %} @@ -155,7 +154,7 @@
@@ -185,11 +184,11 @@
-
+
- + {% if 'compare_url' in validation %} {% endif %} diff --git a/templates/result.html b/templates/result.html index f18e9ff..937f9ca 100644 --- a/templates/result.html +++ b/templates/result.html @@ -23,9 +23,9 @@ - {% for head in head_row %} - {% if not head == 'Grew-match URL' %} - + {% for h, h_t in head %} + {% if not h == 'Grew-match URL' %} + {% endif %} {% endfor %} diff --git a/translations/en/LC_MESSAGES/messages.mo b/translations/en/LC_MESSAGES/messages.mo index beec15e8fb4ac7b8d31f3560e079f575cdf87a6c..02ffe293f92390b8ff38841ff9e68c9d2e1d536e 100644 GIT binary patch delta 644 zcmXZZJxE(o6u|NGY(A=qiK!9|qP&7i!PsaNgTa=H;_P54rGupL2}Mn;jh{;pHz&iJ zL=YDj(UuT!>EPh!XrWSE3WY+ubaAj<3jPmVxSZcT_uY?k?>mftiEoYB@L;|>n zG$|88c!Xg*Gx;^vlmA4T{3BH3f0O&YA~obe^kE~`Vk^=lPVi$At1#_lnhrcG->h53 zAiWZGXem1cJ!0SFpHRPlHu)uLDPK|N{WktF-lAUNFKUTC7HcVWsHL=`p4^67N<3&v zNw`0%-W1muI%U2t9c3TgYK)*;OrVa>;v-x_z3m1zV+r+D5AgvWqaJaB2|PF7@35Wx zAx}JrPq7WB!%~zMI-3mWf{&QO@3@N5I(`wBFk*=ea~jA?s#&J<3ZIi-@jw?CZV-9F z_&3xGG(|ZSJMb|kP=?;-7YZ^oxtPgi9XIWH?QVMxymnz_&Z&%ek36-hu4J#>)0a*T zbap2z{+bQT-3siQ8U4X4t6^&1dB5P~vMcs{rtmJGvopC#*9yhlPJex+D-^Q=_7i70 PGdnlqd`MSD!@qp@xS>|l delta 625 zcmX}oODKd<6u|NGjTwU(Galnn67tv>@fndxLSbPi8!0u+6y=#mlhiEitnk^$%Em%w z!M6|#8_G(tuuv?lDH0nS{)aDhyT5zReVu!6!|CwGP|7PJmRlqrchQGwq{%5=0M9Xq z*G~M1g~TsN6Y+>-E2wc0b1;ONSb@1%hcs!S(|e;HrdWY-%n--wUm82 zJ@VLzPf+JCocIQ{ln2yxZ;qdiU#L&`MlCVGW-X-@wUj#4Qo??xlospBHIkYjb;&y2 z(!hQ_qK!_s_Mzs7umDF)3{8xPtF^gwuIkWbnP*24Yf8l0gJJi4XahD}2T-@^#>CB30-^ z=^mS1T9oeia%^TiVMX1;-ri(vdTuIVZMoBSzsGjxMjFgWrP&m1Zmn-JZEw!H@xNxn kw`aHeuMMlj8_JHy7b*v1i<7f\n" "Language-Team: en \n" @@ -18,99 +18,99 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "Generated-By: Babel 2.14.0\n" -#: app.py:108 +#: app.py:144 msgid "Tree" msgstr "" -#: app.py:109 +#: app.py:145 msgid "Frequency" msgstr "" -#: app.py:110 +#: app.py:146 msgid "Frequency in B" msgstr "Frequency-B" -#: app.py:111 +#: app.py:147 msgid "Order" msgstr "" -#: app.py:112 +#: app.py:148 msgid "Number of nodes" msgstr "Node count" -#: app.py:113 +#: app.py:149 msgid "Head node" msgstr "Head" -#: app.py:114 +#: app.py:150 msgid "Grew-match URL" msgstr "" -#: app.py:115 +#: app.py:151 msgid "Ratio" msgstr "" -#: app.py:116 +#: app.py:152 msgid "%DIFF" msgstr "" -#: app.py:117 +#: app.py:153 msgid "OR" msgstr "" -#: app.py:118 +#: app.py:154 msgid "BIC" msgstr "" -#: app.py:119 +#: app.py:155 msgid "MI" msgstr "" -#: app.py:120 +#: app.py:156 msgid "logDice" msgstr "" -#: app.py:121 +#: app.py:157 msgid "t-score" msgstr "" -#: app.py:124 +#: app.py:160 msgid "Frequency in A" msgstr "Frequency-A" -#: app.py:188 app.py:189 +#: app.py:231 app.py:232 msgid "Please insert either input url or file, not both of them." msgstr "Please insert either a file or a URL link, not both of them." -#: app.py:199 app.py:280 +#: app.py:242 app.py:323 msgid "Incorrect URL!" msgstr "" -#: app.py:201 app.py:202 +#: app.py:244 app.py:245 msgid "Please insert either input url or provide a file." msgstr "Please insert either a file or a URL link." -#: app.py:210 +#: app.py:253 msgid "Please select at least one node type." msgstr "" -#: app.py:215 +#: app.py:258 msgid "Node option" msgstr "Node option" -#: app.py:215 +#: app.py:258 msgid "is not supported. Please enter valid options." msgstr "" -#: app.py:268 app.py:269 +#: app.py:311 app.py:312 msgid "Please insert either compare url or file, not both of them." msgstr "Please insert either a file or a URL link, not both of them." -#: app.py:292 +#: app.py:335 msgid "Please insert an Integer." msgstr "Please insert an integer number." -#: app.py:317 +#: app.py:360 msgid "" "Processing failed! Please recheck your settings, e.g. input format or head " "node description." @@ -118,15 +118,15 @@ msgstr "" "Processing failed! Please recheck your settings, e.g. input format or query " "description." -#: app.py:326 +#: app.py:369 msgid "Frequency " msgstr "" -#: app.py:326 +#: app.py:369 msgid "Frequency in A " msgstr "Frequency-A " -#: app.py:327 templates/base.html:20 templates/base.html:22 +#: app.py:370 templates/base.html:20 templates/base.html:22 #: templates/index.html:8 templates/result.html:15 msgid "code" msgstr "en" @@ -234,19 +234,19 @@ msgstr "Input treebank" msgid "Upload a treebank" msgstr "Upload a treebank" -#: templates/index.html:12 templates/index.html:20 templates/index.html:171 -#: templates/index.html:178 +#: templates/index.html:12 templates/index.html:20 templates/index.html:173 +#: templates/index.html:180 msgid "in CONLL-U format" msgstr "in CONLL-U format" -#: templates/index.html:12 templates/index.html:44 templates/index.html:48 -#: templates/index.html:94 templates/index.html:109 templates/index.html:125 -#: templates/index.html:131 templates/index.html:137 templates/index.html:143 -#: templates/index.html:151 templates/index.html:170 templates/index.html:171 +#: templates/index.html:12 templates/index.html:46 templates/index.html:50 +#: templates/index.html:96 templates/index.html:111 templates/index.html:127 +#: templates/index.html:133 templates/index.html:139 templates/index.html:145 +#: templates/index.html:153 templates/index.html:172 templates/index.html:173 msgid "Help" msgstr "Help" -#: templates/index.html:15 templates/index.html:174 +#: templates/index.html:15 templates/index.html:176 msgid "Browse" msgstr "Browse" @@ -254,147 +254,143 @@ msgstr "Browse" msgid "Upload" msgstr "Upload" -#: templates/index.html:29 templates/index.html:188 +#: templates/index.html:29 templates/index.html:190 msgid "Or" msgstr "Or" -#: templates/index.html:29 templates/index.html:188 +#: templates/index.html:29 templates/index.html:190 msgid "insert a URL link to a treebank in CONLL-U format" -msgstr "insert a URL link to a treebank in CONLL-U format" +msgstr "insert a URL link to a treebank in CONLL-U format (examples:" -#: templates/index.html:29 templates/index.html:188 -msgid "Example" -msgstr "Example" - -#: templates/index.html:38 +#: templates/index.html:40 msgid "Tree specification" msgstr "Tree specification" -#: templates/index.html:44 +#: templates/index.html:46 msgid "Tree size" msgstr "Tree size" -#: templates/index.html:44 +#: templates/index.html:46 msgid "number of tokens in the tree" msgstr "number of tokens (words) in the tree" -#: templates/index.html:48 +#: templates/index.html:50 msgid "Node type" msgstr "Node type" -#: templates/index.html:48 +#: templates/index.html:50 msgid "token characteristics to consider" msgstr "token characteristics to consider" -#: templates/index.html:54 -msgid "No type" -msgstr "No type" - -#: templates/index.html:63 +#: templates/index.html:56 msgid "Part-of-speech" msgstr "Part-of-speech" -#: templates/index.html:69 +#: templates/index.html:62 msgid "Lemma" msgstr "Lemma" -#: templates/index.html:75 +#: templates/index.html:68 msgid "Form" msgstr "Form" -#: templates/index.html:89 +#: templates/index.html:74 +msgid "No type" +msgstr "No type" + +#: templates/index.html:91 msgid "Advanced settings" msgstr "Advanced settings" -#: templates/index.html:94 +#: templates/index.html:96 msgid "Labeled trees" msgstr "Labeled trees" -#: templates/index.html:94 +#: templates/index.html:96 msgid "include names of dependency relations" msgstr "include names of dependency relations" -#: templates/index.html:98 templates/index.html:113 templates/index.html:155 +#: templates/index.html:100 templates/index.html:115 templates/index.html:157 msgid "No" msgstr "No" -#: templates/index.html:101 templates/index.html:116 templates/index.html:158 +#: templates/index.html:103 templates/index.html:118 templates/index.html:160 msgid "Yes" msgstr "Yes" -#: templates/index.html:109 +#: templates/index.html:111 msgid "Fixed order" msgstr "Fixed order" -#: templates/index.html:109 +#: templates/index.html:111 msgid "differentiate trees based on surface word order" msgstr "differentiate trees based on surface word order" -#: templates/index.html:125 +#: templates/index.html:127 msgid "Head" msgstr "Head" -#: templates/index.html:125 +#: templates/index.html:127 msgid "specify potential restrictions on the head node" msgstr "specify potential restrictions on the head node" -#: templates/index.html:131 +#: templates/index.html:133 msgid "Ignored labels" msgstr "" -#: templates/index.html:131 +#: templates/index.html:133 msgid "specify the dependency labels of nodes to be ignored" msgstr "" -#: templates/index.html:137 +#: templates/index.html:139 msgid "Query" msgstr "" -#: templates/index.html:137 +#: templates/index.html:139 msgid "write a query. Note: Tree size attribute will be ignored!" msgstr "" -#: templates/index.html:143 +#: templates/index.html:145 msgid "Frequency threshold" msgstr "Frequency threshold" -#: templates/index.html:143 +#: templates/index.html:145 msgid "specify the minimum frequency of a tree in the treebank" msgstr "specify the minimum frequency of a tree in the treebank" -#: templates/index.html:151 +#: templates/index.html:153 msgid "Association measures" msgstr "Association measures" -#: templates/index.html:151 +#: templates/index.html:153 msgid "print MI, logDice and t-score" msgstr "print MI, logDice and t-score" -#: templates/index.html:166 +#: templates/index.html:168 msgid "Compare treebanks" msgstr "" -#: templates/index.html:170 +#: templates/index.html:172 msgid "" -"Select a reference treebank to identify key phenomena (prints the frequency ration and the %DIFF, " +"Select a reference treebank to identify key phenomena (prints the %DIFF, " "BIC and OR keyness scores)." msgstr "" -"Select a reference treebank to identify key phenomena (prints the %DIFF, " -"BIC and Odds Ratio scores)." +"Select a reference treebank to identify key phenomena (prints the frequency " +"ration and the %DIFF, BIC and OR keyness scores)." -#: templates/index.html:171 templates/index.html:178 +#: templates/index.html:173 templates/index.html:180 msgid "Upload a compare corpus" msgstr "Upload a reference treebank" -#: templates/index.html:202 +#: templates/index.html:206 msgid "Submit" msgstr "Get trees" -#: templates/index.html:210 +#: templates/index.html:214 msgid "No results" msgstr "" -#: templates/index.html:211 +#: templates/index.html:215 msgid "Processing with your settings didnt produce any results!" msgstr "Processing with your settings did not produce any results." @@ -410,6 +406,9 @@ msgstr "Back to selected settings" msgid "Download complete results" msgstr "Download complete results" +#~ msgid "Example" +#~ msgstr "Example" + #~ msgid "intro_description" #~ msgstr "" #~ "Welcome to the online demo interface for STARK - a highly-customizible " diff --git a/translations/sl/LC_MESSAGES/messages.mo b/translations/sl/LC_MESSAGES/messages.mo index 3365c7a13ba9d71eb763c7fbbc224a1411ff1a19..8d44194d6ffff4f6c687afedcb91c57b39c30559 100644 GIT binary patch delta 1577 zcmXxiZ)jCz9KiA4N$=g=?7F$TO=tW3bP(-CD_ChJaVPd0jP)Q8>{@N29&gXf~bAHe7 z_x!ope|75{!_`$HG8YqBfq&t0ToxCp#{@QDGp@u=Y{VYde-Kmj_qhIE)c623zUcY~ z-S|t+H&N$37MH5fmQ%cv_%Tw0oWVN$8t=gGo##*kFSzlaQ47D0ns5QNz(v%!B$McT zO{fcK!@IBxx8p-~RgrBpUf{zfJdIs=9fvWQ5P1Nzs1qGWhGYhJ;w(Ok3rJ2GrV1S& zMO{!1bw{Rr(448KDS{1MZ5(T&Ggz81I|wcs7ti+R+< z?_vjjfSvdSYWy#_1)JEeejG$CuzJunUPIlYBhHhk1$~M<@{RMN^Qv>+c^kEW*qtKx zU=npQtG$>y0T{ElNi@eV-x)y*oH$GBfr@H8k`mCgwJCu?nhn0H0nejq9!Qwf-2NCxRU(RO+(MTAK69OjvBZN*W#0?w{_Avi#_z` zaU-@<&C|FC^}iX^_&L;_S-{=6h?DpzH;_>I9IGufexRWN*HCZyE%(FU$RqU}lm>L5 zUanr(-;KKBr<~8={q!?PE;)<_XHX0K76&j+Qa#F@E$sijG#=waHwHL}hfycGf@w@~ z9((Z-d>N19Wn9leZouW7(;+Tb8guk#*N8;e$wg`7`#IEvzqT)3zCTcp`gS`3dg=6~ zm#PDG!mTwwcAz#NJDS`V1VCNd*-qF8%1{zS}_rV2K?6i;~3+Qcz0`lo){>mIWO z8;sdtbjtl|^5Z7RkJ+Lr<;{pS{?bIzffYx+WPfkpX0vI_K;O3eHugp9lXG4z)p(+H z$cA>pmNP*qu!d%4)X&=5Cyj-MheKO2<*-GiE%rxiYy; z$%eHn&86Bqsap-EyAb+}`vbMh=?uaggs48dM?Xe z4k5NI-ceX@M+<5}0<~ZSD;z}nq|gK*Af@UF~zwT(?gk^s-bLRWz zo6GluKW=~Ja5bZpT23jo7JtG<{2NzdV_Ke;>BdKVnIyKjdBvR$WNW)PYO7XS^TX^LjoJv);erKxr*Cy1@1seup77H1Lk`XrO;^0_4 z7T%4w;Rwox#!-&CiWe+)jvSgg$zr^js(P;8P;X&3A3i`ikp(k;2{+PTHseiPv@Fzy za;M!W^9N9lco%XAYCp;jN0Cr<)bs;vrGElDSzpy?$labX&Y~pz5M>7+qa?V9lK5Mc zlevO&HGi7EWR=I4HFlsB(1lD<8;ye~`S#-q)>n_vkRyH!CBVU3v4rwiV&g^JOuv!U z<*^Q7KThEhd=F)QhL;tJG$dd%%1I2POt=pva1@DA zr_J~|l*jd{>3@T=^Q*?6ae)4>NKNWa7SXs1b9e-Y@#S{TU+!{&fgbz96ErBv`;s#(Or@-^@-Pm^{9{C|CSoHvzQO zA^zksg=pgov70)P8JV*Eg6G6bsdwVn(hnzB(kW}OPz)nC?`StT78ZTG?1q81$HGck z`)=U+6<^yyUi(@FIJ)FcCrg=GYrvg${+m^r2rFJ*kMY^JJ6U zPtlh=zv>Mu8Et&kYTmXbw@v5zhwmP|t3Q`qYg)F_g`(>_#rVrL@5V2+gh@kd*4nc# z^uoECTXu9{Px^K+IX@%yN-uKeYLkwhpD8<$>xDWBr#*LmX0E0qoi93(Q>r9gYbUJu zRJL^Bp&QZv7oY>#gQLgXva8JkVgANy<91)%(DqB5YF|v+Iu53X^rpZrmF\n" "Language-Team: sl \n" @@ -18,99 +18,99 @@ msgstr "" "n%100==4 ? 2 : 3);\n" "Generated-By: Babel 2.14.0\n" -#: app.py:108 +#: app.py:144 msgid "Tree" msgstr "Drevo" -#: app.py:109 +#: app.py:145 msgid "Frequency" msgstr "Pogostost" -#: app.py:110 +#: app.py:146 msgid "Frequency in B" msgstr "Pogostost v B" -#: app.py:111 +#: app.py:147 msgid "Order" msgstr "Besedni red" -#: app.py:112 +#: app.py:148 msgid "Number of nodes" msgstr "Št. vozlišč" -#: app.py:113 +#: app.py:149 msgid "Head node" msgstr "Jedro" -#: app.py:114 +#: app.py:150 msgid "Grew-match URL" msgstr "Povezava na Grew-match" -#: app.py:115 +#: app.py:151 msgid "Ratio" msgstr "" -#: app.py:116 +#: app.py:152 msgid "%DIFF" msgstr "" -#: app.py:117 +#: app.py:153 msgid "OR" msgstr "" -#: app.py:118 +#: app.py:154 msgid "BIC" msgstr "" -#: app.py:119 +#: app.py:155 msgid "MI" msgstr "MI" -#: app.py:120 +#: app.py:156 msgid "logDice" msgstr "logDice" -#: app.py:121 +#: app.py:157 msgid "t-score" msgstr "t-test" -#: app.py:124 +#: app.py:160 msgid "Frequency in A" msgstr "Pogostost v A" -#: app.py:188 app.py:189 +#: app.py:231 app.py:232 msgid "Please insert either input url or file, not both of them." msgstr "Naložite datoteko ali vnesite povezavo URL, ne pa obojega." -#: app.py:199 app.py:280 +#: app.py:242 app.py:323 msgid "Incorrect URL!" msgstr "URL ni pravilne oblike." -#: app.py:201 app.py:202 +#: app.py:244 app.py:245 msgid "Please insert either input url or provide a file." msgstr "Naložite datoteko ali vnesite povezavo URL." -#: app.py:210 +#: app.py:253 msgid "Please select at least one node type." msgstr "Izberite vsaj eno možnost (npr. besedno vrsto)." -#: app.py:215 +#: app.py:258 msgid "Node option" msgstr "Vrsta vozlišč" -#: app.py:215 +#: app.py:258 msgid "is not supported. Please enter valid options." msgstr "vmesnik ne podpira. Vnesite eno izmed veljavnih možnosti." -#: app.py:268 app.py:269 +#: app.py:311 app.py:312 msgid "Please insert either compare url or file, not both of them." msgstr "Naložite datoteko ali vnesite povezavo URL, ne pa obojega." -#: app.py:292 +#: app.py:335 msgid "Please insert an Integer." msgstr "Vnesite celo število (npr. 3)." -#: app.py:317 +#: app.py:360 msgid "" "Processing failed! Please recheck your settings, e.g. input format or head " "node description." @@ -118,15 +118,15 @@ msgstr "" "Procesiranje ni bilo uspešno! Preverite nastavitve, kot sta format ali opis " "lastnosti jedra." -#: app.py:326 +#: app.py:369 msgid "Frequency " msgstr "Pogostost " -#: app.py:326 +#: app.py:369 msgid "Frequency in A " msgstr "Pogostost v A " -#: app.py:327 templates/base.html:20 templates/base.html:22 +#: app.py:370 templates/base.html:20 templates/base.html:22 #: templates/index.html:8 templates/result.html:15 msgid "code" msgstr "sl" @@ -235,19 +235,19 @@ msgstr "Vhodni podatki" msgid "Upload a treebank" msgstr "Naložite korpus" -#: templates/index.html:12 templates/index.html:20 templates/index.html:171 -#: templates/index.html:178 +#: templates/index.html:12 templates/index.html:20 templates/index.html:173 +#: templates/index.html:180 msgid "in CONLL-U format" msgstr "v formatu CONLL-U" -#: templates/index.html:12 templates/index.html:44 templates/index.html:48 -#: templates/index.html:94 templates/index.html:109 templates/index.html:125 -#: templates/index.html:131 templates/index.html:137 templates/index.html:143 -#: templates/index.html:151 templates/index.html:170 templates/index.html:171 +#: templates/index.html:12 templates/index.html:46 templates/index.html:50 +#: templates/index.html:96 templates/index.html:111 templates/index.html:127 +#: templates/index.html:133 templates/index.html:139 templates/index.html:145 +#: templates/index.html:153 templates/index.html:172 templates/index.html:173 msgid "Help" msgstr "pomoč" -#: templates/index.html:15 templates/index.html:174 +#: templates/index.html:15 templates/index.html:176 msgid "Browse" msgstr "Izberi" @@ -255,149 +255,143 @@ msgstr "Izberi" msgid "Upload" msgstr "Naloži datoteko" -#: templates/index.html:29 templates/index.html:188 +#: templates/index.html:29 templates/index.html:190 msgid "Or" msgstr "Ali" -#: templates/index.html:29 templates/index.html:188 +#: templates/index.html:29 templates/index.html:190 msgid "insert a URL link to a treebank in CONLL-U format" -msgstr "vnesite povezavo URL do korpusa v formatu CONLL-U" +msgstr "vnesite povezavo URL do korpusa v formatu CONLL-U (primeri:" -#: templates/index.html:29 templates/index.html:188 -msgid "Example" -msgstr "primer" - -#: templates/index.html:38 +#: templates/index.html:40 msgid "Tree specification" msgstr "Opredelitev dreves" -#: templates/index.html:44 +#: templates/index.html:46 msgid "Tree size" msgstr "Velikost drevesa" -#: templates/index.html:44 +#: templates/index.html:46 msgid "number of tokens in the tree" msgstr "število vozlišč (besed) v drevesu" -#: templates/index.html:48 +#: templates/index.html:50 msgid "Node type" msgstr "Vrsta vozlišč" -#: templates/index.html:48 +#: templates/index.html:50 msgid "token characteristics to consider" msgstr "upoštevane lastnosti besed" -#: templates/index.html:54 -msgid "No type" -msgstr "Brez vrste" - -#: templates/index.html:63 +#: templates/index.html:56 msgid "Part-of-speech" msgstr "Besedna vrsta" -#: templates/index.html:69 +#: templates/index.html:62 msgid "Lemma" msgstr "Lema" -#: templates/index.html:75 +#: templates/index.html:68 msgid "Form" msgstr "Oblika" -#: templates/index.html:89 +#: templates/index.html:74 +msgid "No type" +msgstr "Brez vrste" + +#: templates/index.html:91 msgid "Advanced settings" msgstr "Napredne nastavitve" -#: templates/index.html:94 +#: templates/index.html:96 msgid "Labeled trees" msgstr "Označena drevesa" -#: templates/index.html:94 +#: templates/index.html:96 msgid "include names of dependency relations" msgstr "izpis vrste relacij med besedami" -#: templates/index.html:98 templates/index.html:113 templates/index.html:155 +#: templates/index.html:100 templates/index.html:115 templates/index.html:157 msgid "No" msgstr "Ne" -#: templates/index.html:101 templates/index.html:116 templates/index.html:158 +#: templates/index.html:103 templates/index.html:118 templates/index.html:160 msgid "Yes" msgstr "Da" -#: templates/index.html:109 +#: templates/index.html:111 msgid "Fixed order" msgstr "Nespremenljiv besedni red" -#: templates/index.html:109 +#: templates/index.html:111 msgid "differentiate trees based on surface word order" msgstr "ločevanje dreves glede na zaporedje besed v besedilu" -#: templates/index.html:125 +#: templates/index.html:127 msgid "Head" msgstr "Jedro" -#: templates/index.html:125 +#: templates/index.html:127 msgid "specify potential restrictions on the head node" msgstr "izpis dreves z vnaprej določenimi lastnostmi jedrne besede v drevesu" -#: templates/index.html:131 +#: templates/index.html:133 msgid "Ignored labels" msgstr "Nerelevantne relacije" -#: templates/index.html:131 +#: templates/index.html:133 msgid "specify the dependency labels of nodes to be ignored" -msgstr "seznam skladenjskih oznak vozlišč, ki se lahko pojavijo v drevesu, a niso prikazane v izpisu" +msgstr "relacije vozlišč, ki naj se ne prikazujejo v izpisu" -#: templates/index.html:137 +#: templates/index.html:139 msgid "Query" msgstr "Iskalni pogoj" -#: templates/index.html:137 +#: templates/index.html:139 msgid "write a query. Note: Tree size attribute will be ignored!" -msgstr "" -"izpis dreves z vnaprej določeno strukturo (nastavitev velikosti drevesa se s " -"tem ne upošteva.) " +msgstr "izpis dreves z vnaprej določeno strukturo" -#: templates/index.html:143 +#: templates/index.html:145 msgid "Frequency threshold" msgstr "Frekvenčni prag" -#: templates/index.html:143 +#: templates/index.html:145 msgid "specify the minimum frequency of a tree in the treebank" msgstr "najmanjše število pojavitev drevesa v korpusu" -#: templates/index.html:151 +#: templates/index.html:153 msgid "Association measures" msgstr "Mere povezovalnosti" -#: templates/index.html:151 +#: templates/index.html:153 msgid "print MI, logDice and t-score" msgstr "izračun vrednosti MI, logDice in t-test" -#: templates/index.html:166 +#: templates/index.html:168 msgid "Compare treebanks" msgstr "Primerjava korpusov" -#: templates/index.html:170 +#: templates/index.html:172 msgid "" "Select a reference treebank to identify key phenomena (prints the %DIFF, " "BIC and OR keyness scores)." msgstr "" -"Primerjava z rezultati v referenčnem korpusu (izračun razmerja frekvenc ter vrednosti %DIFF, " -"BIC in Odds Ratio)" +"Primerjava z rezultati v referenčnem korpusu (izračun razmerja frekvenc ter " +"vrednosti %DIFF, BIC in Odds Ratio)" -#: templates/index.html:171 templates/index.html:178 +#: templates/index.html:173 templates/index.html:180 msgid "Upload a compare corpus" msgstr "Naložite referenčni korpus" -#: templates/index.html:202 +#: templates/index.html:206 msgid "Submit" msgstr "Poišči drevesa" -#: templates/index.html:210 +#: templates/index.html:214 msgid "No results" msgstr "Brez zadetkov" -#: templates/index.html:211 +#: templates/index.html:215 msgid "Processing with your settings didnt produce any results!" msgstr "Procesiranje z izbranimi nastavitvami ne vrača rezultatov." @@ -413,6 +407,9 @@ msgstr "Nazaj na izbrane nastavitve" msgid "Download complete results" msgstr "Prenesi datoteko s celotnimi rezultati" +#~ msgid "Example" +#~ msgstr "primer" + #~ msgid "Please provide information about minimum and maximum tree size." #~ msgstr "Določite najmanjše in največje število vozlišč v drevesu."
{{ head }} ▾▴{{ h_t }} ▾▴