Changeset - 4df61d1bd2d5
[Not reviewed]
kallithea/controllers/changeset.py
Show inline comments
 
@@ -83,27 +83,27 @@ def get_ignore_ws(fid, GET):
 

	
 

	
 
def _ignorews_url(GET, fileid=None):
 
    fileid = str(fileid) if fileid else None
 
    params = defaultdict(list)
 
    _update_with_GET(params, GET)
 
    lbl = _('Show white space')
 
    lbl = _('Show whitespace')
 
    ig_ws = get_ignore_ws(fileid, GET)
 
    ln_ctx = get_line_ctx(fileid, GET)
 
    # global option
 
    if fileid is None:
 
        if ig_ws is None:
 
            params['ignorews'] += [1]
 
            lbl = _('Ignore white space')
 
            lbl = _('Ignore whitespace')
 
        ctx_key = 'context'
 
        ctx_val = ln_ctx
 
    # per file options
 
    else:
 
        if ig_ws is None:
 
            params[fileid] += ['WS:1']
 
            lbl = _('Ignore white space')
 
            lbl = _('Ignore whitespace')
 

	
 
        ctx_key = fileid
 
        ctx_val = 'C:%s' % ln_ctx
 
    # if we have passed in ln_ctx pass it along to our params
 
    if ln_ctx:
 
        params[ctx_key] += [ctx_val]
kallithea/i18n/de/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -29,17 +29,17 @@ msgstr "Alle Branches"
 

	
 
#: kallithea/controllers/changelog.py:189
 
msgid "(closed)"
 
msgstr ""
 

	
 
#: kallithea/controllers/changeset.py:87
 
msgid "Show white space"
 
msgid "Show whitespace"
 
msgstr ""
 

	
 
#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101
 
msgid "Ignore white space"
 
msgid "Ignore whitespace"
 
msgstr ""
 

	
 
#: kallithea/controllers/changeset.py:167
 
#, python-format
 
msgid "increase diff context to %(num)s lines"
 
msgstr ""
 
@@ -5030,13 +5030,13 @@ msgstr ""
 
#: kallithea/templates/files/diff_2way.html:22
 
#: kallithea/templates/files/file_diff.html:11
 
msgid "File diff"
 
msgstr ""
 

	
 
#: kallithea/templates/files/diff_2way.html:58
 
msgid "ignore white space"
 
msgid "ignore whitespace"
 
msgstr ""
 

	
 
#: kallithea/templates/files/diff_2way.html:59
 
msgid "turn on edit mode"
 
msgstr ""
 

	
kallithea/i18n/en/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -28,17 +28,17 @@ msgstr ""
 

	
 
#: kallithea/controllers/changelog.py:189
 
msgid "(closed)"
 
msgstr ""
 

	
 
#: kallithea/controllers/changeset.py:87
 
msgid "Show white space"
 
msgid "Show whitespace"
 
msgstr ""
 

	
 
#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101
 
msgid "Ignore white space"
 
msgid "Ignore whitespace"
 
msgstr ""
 

	
 
#: kallithea/controllers/changeset.py:167
 
#, python-format
 
msgid "increase diff context to %(num)s lines"
 
msgstr ""
 
@@ -5013,13 +5013,13 @@ msgstr ""
 
#: kallithea/templates/files/diff_2way.html:22
 
#: kallithea/templates/files/file_diff.html:11
 
msgid "File diff"
 
msgstr ""
 

	
 
#: kallithea/templates/files/diff_2way.html:58
 
msgid "ignore white space"
 
msgid "ignore whitespace"
 
msgstr ""
 

	
 
#: kallithea/templates/files/diff_2way.html:59
 
msgid "turn on edit mode"
 
msgstr ""
 

	
kallithea/i18n/fr/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -29,17 +29,17 @@ msgstr "Toutes les branches"
 

	
 
#: kallithea/controllers/changelog.py:189
 
msgid "(closed)"
 
msgstr ""
 

	
 
#: kallithea/controllers/changeset.py:87
 
msgid "Show white space"
 
msgid "Show whitespace"
 
msgstr "Afficher les espaces et tabulations"
 

	
 
#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101
 
msgid "Ignore white space"
 
msgid "Ignore whitespace"
 
msgstr "Ignorer les espaces et tabulations"
 

	
 
#: kallithea/controllers/changeset.py:167
 
#, python-format
 
msgid "increase diff context to %(num)s lines"
 
msgstr ""
 
@@ -5046,13 +5046,13 @@ msgstr ""
 
#: kallithea/templates/files/diff_2way.html:22
 
#: kallithea/templates/files/file_diff.html:11
 
msgid "File diff"
 
msgstr "Diff de fichier"
 

	
 
#: kallithea/templates/files/diff_2way.html:58
 
msgid "ignore white space"
 
msgid "ignore whitespace"
 
msgstr ""
 

	
 
#: kallithea/templates/files/diff_2way.html:59
 
msgid "turn on edit mode"
 
msgstr ""
 

	
kallithea/i18n/ja/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -34,17 +34,17 @@ msgstr "すべてのブランチ"
 

	
 
#: kallithea/controllers/changelog.py:189
 
msgid "(closed)"
 
msgstr "(閉鎖済み)"
 

	
 
#: kallithea/controllers/changeset.py:87
 
msgid "Show white space"
 
msgid "Show whitespace"
 
msgstr "空白を表示"
 

	
 
#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101
 
msgid "Ignore white space"
 
msgid "Ignore whitespace"
 
msgstr "空白を無視"
 

	
 
#: kallithea/controllers/changeset.py:167
 
#, python-format
 
msgid "increase diff context to %(num)s lines"
 
msgstr "diff コンテキストを %(num)s 行増やす"
 
@@ -5027,13 +5027,13 @@ msgstr "%s ファイルの差分を並べて表示"
 
#: kallithea/templates/files/diff_2way.html:22
 
#: kallithea/templates/files/file_diff.html:11
 
msgid "File diff"
 
msgstr "ファイル差分"
 

	
 
#: kallithea/templates/files/diff_2way.html:58
 
msgid "ignore white space"
 
msgid "ignore whitespace"
 
msgstr "空白を無視"
 

	
 
#: kallithea/templates/files/diff_2way.html:59
 
msgid "turn on edit mode"
 
msgstr "編集モード"
 

	
kallithea/i18n/kallithea.pot
Show inline comments
 
@@ -27,17 +27,17 @@ msgstr ""
 

	
 
#: kallithea/controllers/changelog.py:189
 
msgid "(closed)"
 
msgstr ""
 

	
 
#: kallithea/controllers/changeset.py:87
 
msgid "Show white space"
 
msgid "Show whitespace"
 
msgstr ""
 

	
 
#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101
 
msgid "Ignore white space"
 
msgid "Ignore whitespace"
 
msgstr ""
 

	
 
#: kallithea/controllers/changeset.py:167
 
#, python-format
 
msgid "increase diff context to %(num)s lines"
 
msgstr ""
 
@@ -4891,13 +4891,13 @@ msgstr ""
 
#: kallithea/templates/files/diff_2way.html:22
 
#: kallithea/templates/files/file_diff.html:11
 
msgid "File diff"
 
msgstr ""
 

	
 
#: kallithea/templates/files/diff_2way.html:58
 
msgid "ignore white space"
 
msgid "ignore whitespace"
 
msgstr ""
 

	
 
#: kallithea/templates/files/diff_2way.html:59
 
msgid "turn on edit mode"
 
msgstr ""
 

	
kallithea/i18n/pl/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -34,17 +34,17 @@ msgstr "Wszystkie gałęzie"
 

	
 
#: kallithea/controllers/changelog.py:189
 
msgid "(closed)"
 
msgstr "(zamknięty)"
 

	
 
#: kallithea/controllers/changeset.py:87
 
msgid "Show white space"
 
msgid "Show whitespace"
 
msgstr "pokazuj spacje"
 

	
 
#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101
 
msgid "Ignore white space"
 
msgid "Ignore whitespace"
 
msgstr "Ignoruj pokazywanie spacji"
 

	
 
#: kallithea/controllers/changeset.py:167
 
#, python-format
 
msgid "increase diff context to %(num)s lines"
 
msgstr ""
 
@@ -5086,13 +5086,13 @@ msgstr "Pliki z listą zmian i różnic: %s"
 
#: kallithea/templates/files/diff_2way.html:22
 
#: kallithea/templates/files/file_diff.html:11
 
msgid "File diff"
 
msgstr "Pliki różnic"
 

	
 
#: kallithea/templates/files/diff_2way.html:58
 
msgid "ignore white space"
 
msgid "ignore whitespace"
 
msgstr "ignoruj spacje"
 

	
 
#: kallithea/templates/files/diff_2way.html:59
 
msgid "turn on edit mode"
 
msgstr "włączyć tryb edycji"
 

	
kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -30,17 +30,17 @@ msgstr "Todos os Ramos"
 

	
 
#: kallithea/controllers/changelog.py:189
 
msgid "(closed)"
 
msgstr "(fechado)"
 

	
 
#: kallithea/controllers/changeset.py:87
 
msgid "Show white space"
 
msgid "Show whitespace"
 
msgstr "Mostrar espaços em branco"
 

	
 
#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101
 
msgid "Ignore white space"
 
msgid "Ignore whitespace"
 
msgstr "Ignorar espaços em branco"
 

	
 
#: kallithea/controllers/changeset.py:167
 
#, python-format
 
msgid "increase diff context to %(num)s lines"
 
msgstr ""
 
@@ -5071,13 +5071,13 @@ msgstr "Arquivo %s diff lado-a-lado"
 
#: kallithea/templates/files/diff_2way.html:22
 
#: kallithea/templates/files/file_diff.html:11
 
msgid "File diff"
 
msgstr "Diff do arquivo"
 

	
 
#: kallithea/templates/files/diff_2way.html:58
 
msgid "ignore white space"
 
msgid "ignore whitespace"
 
msgstr "ignorar espaços em branco"
 

	
 
#: kallithea/templates/files/diff_2way.html:59
 
msgid "turn on edit mode"
 
msgstr "habilitar modo de edição"
 

	
kallithea/i18n/ru/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -39,17 +39,17 @@ msgstr "Все ветки"
 

	
 
#: kallithea/controllers/changelog.py:189
 
msgid "(closed)"
 
msgstr "(закрыто)"
 

	
 
#: kallithea/controllers/changeset.py:87
 
msgid "Show white space"
 
msgid "Show whitespace"
 
msgstr "Отображать пробелы"
 

	
 
#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101
 
msgid "Ignore white space"
 
msgid "Ignore whitespace"
 
msgstr "Игнорировать пробелы"
 

	
 
#: kallithea/controllers/changeset.py:167
 
#, python-format
 
msgid "increase diff context to %(num)s lines"
 
msgstr ""
 
@@ -5099,13 +5099,13 @@ msgstr ""
 
#: kallithea/templates/files/diff_2way.html:22
 
#: kallithea/templates/files/file_diff.html:11
 
msgid "File diff"
 
msgstr "Сравнение файлов "
 

	
 
#: kallithea/templates/files/diff_2way.html:58
 
msgid "ignore white space"
 
msgid "ignore whitespace"
 
msgstr "игнорировать пробелы"
 

	
 
#: kallithea/templates/files/diff_2way.html:59
 
msgid "turn on edit mode"
 
msgstr "включить режим редактирования"
 

	
kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -31,17 +31,17 @@ msgstr "所有分支"
 

	
 
#: kallithea/controllers/changelog.py:189
 
msgid "(closed)"
 
msgstr ""
 

	
 
#: kallithea/controllers/changeset.py:87
 
msgid "Show white space"
 
msgid "Show whitespace"
 
msgstr ""
 

	
 
#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101
 
msgid "Ignore white space"
 
msgid "Ignore whitespace"
 
msgstr ""
 

	
 
#: kallithea/controllers/changeset.py:167
 
#, python-format
 
msgid "increase diff context to %(num)s lines"
 
msgstr ""
 
@@ -4988,13 +4988,13 @@ msgstr ""
 
#: kallithea/templates/files/diff_2way.html:22
 
#: kallithea/templates/files/file_diff.html:11
 
msgid "File diff"
 
msgstr "文件差异"
 

	
 
#: kallithea/templates/files/diff_2way.html:58
 
msgid "ignore white space"
 
msgid "ignore whitespace"
 
msgstr ""
 

	
 
#: kallithea/templates/files/diff_2way.html:59
 
msgid "turn on edit mode"
 
msgstr ""
 

	
kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po
Show inline comments
 
@@ -29,17 +29,17 @@ msgstr ""
 

	
 
#: kallithea/controllers/changelog.py:189
 
msgid "(closed)"
 
msgstr ""
 

	
 
#: kallithea/controllers/changeset.py:87
 
msgid "Show white space"
 
msgid "Show whitespace"
 
msgstr ""
 

	
 
#: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101
 
msgid "Ignore white space"
 
msgid "Ignore whitespace"
 
msgstr ""
 

	
 
#: kallithea/controllers/changeset.py:167
 
#, python-format
 
msgid "increase diff context to %(num)s lines"
 
msgstr ""
 
@@ -4986,13 +4986,13 @@ msgstr ""
 
#: kallithea/templates/files/diff_2way.html:22
 
#: kallithea/templates/files/file_diff.html:11
 
msgid "File diff"
 
msgstr "檔案差異"
 

	
 
#: kallithea/templates/files/diff_2way.html:58
 
msgid "ignore white space"
 
msgid "ignore whitespace"
 
msgstr ""
 

	
 
#: kallithea/templates/files/diff_2way.html:59
 
msgid "turn on edit mode"
 
msgstr ""
 

	
kallithea/templates/files/diff_2way.html
Show inline comments
 
@@ -52,14 +52,14 @@ ${self.repo_context_bar('changelog')}
 
                      <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='raw')}" class="tooltip" title="${h.tooltip(_('Raw diff'))}">
 
                          <img class="icon" src="${h.url('/images/icons/page_white.png')}"/>
 
                      </a>
 
                      <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='download')}" class="tooltip" title="${h.tooltip(_('Download diff'))}">
 
                          <img class="icon" src="${h.url('/images/icons/page_save.png')}"/>
 
                      </a>
 
                      ${h.checkbox('ignorews', label=_('ignore white space'))}
 
                      ${h.checkbox('edit_mode', label=_('turn on edit mode'))}
 
                      ${h.checkbox('ignorews', label=_('Ignore whitespace'))}
 
                      ${h.checkbox('edit_mode', label=_('Edit'))}
 
                    </div>
 
                </div>
 
            </div>
 
            <div id="compare"></div>
 
        </div>
 
    </div>
0 comments (0 inline, 0 general)