Loading ...
Sorry, an error occurred while loading the content.

Re: [PATCH] (4/7) Consistency and refactoring

Expand Messages
  • Bram Moolenaar
    ... Thanks for the quick fix. -- A KNIGHT rides into shot and hacks him to the ground. He rides off. We stay for a moment on the glade. A MIDDLE-AGED LADY in
    Message 1 of 25 , Jun 23, 2013
    • 0 Attachment
      ZyX wrote:

      > > Please follow my instructions. gettext searches the source code for
      > > "_()" and "N_()", nothing else. After patch 7.3.1229 existing
      > > translations will work, but the next time the translations are updated
      > > they will be gone.
      > >
      > > You can see the effect by running "make ru" in src/po.
      >
      > # HG changeset patch
      > # User ZyX <kp-pav@...>
      > # Date 1371991354 -14400
      > # Sun Jun 23 16:42:34 2013 +0400
      > # Branch python-fixes
      > # Node ID 3c21dc7cfad1f22855bd64b2a4a79d75cd36b1e3
      > # Parent 8b539b192fd5eae19f61bd3d55a28811ea5bae0c
      > Use N_() to mark strings for translation

      Thanks for the quick fix.

      --
      A KNIGHT rides into shot and hacks him to the ground. He rides off.
      We stay for a moment on the glade. A MIDDLE-AGED LADY in a C. & A.
      twin-set emerges from the trees and looks in horror at the body of her
      HUSBAND.
      MRS HISTORIAN: FRANK!
      "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

      /// Bram Moolenaar -- Bram@... -- http://www.Moolenaar.net \\\
      /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
      \\\ an exciting new programming language -- http://www.Zimbu.org ///
      \\\ help me help AIDS victims -- http://ICCF-Holland.org ///

      --
      --
      You received this message from the "vim_dev" maillist.
      Do not top-post! Type your reply below the text you are replying to.
      For more information, visit http://www.vim.org/maillist.php

      ---
      You received this message because you are subscribed to the Google Groups "vim_dev" group.
      To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscribe@....
      For more options, visit https://groups.google.com/groups/opt_out.
    • Bram Moolenaar
      ... Thanks. When I apply both patches 9 and 10 , plus this one then the tests are passing. I ll send this out as one big patch. -- press CTRL-ALT-DEL for
      Message 2 of 25 , Jun 23, 2013
      • 0 Attachment
        ZyX wrote:

        > > --- testdir/test87.failed 2013-06-23 14:45:47.000000000 +0200
        > > +++ testdir/test87.ok 2013-06-23 14:43:28.000000000 +0200
        > > @@ -1175,6 +1175,9 @@
        > > 3,xx
        > > before
        > > after
        > > +pythonx/topmodule/__init__.py
        > > +pythonx/topmodule/submodule/__init__.py
        > > +pythonx/topmodule/submodule/subsubmodule/subsubsubmodule.py
        > > vim.command("throw 'abcN'"):(<class 'vim.error'>, error('abcN',))
        > > Exe("throw 'def'"):(<class 'vim.error'>, error('def',))
        > > vim.eval("Exe('throw ''ghi''')"):(<class 'vim.error'>, error('ghi',))
        >
        >
        > This should be fixed with the following diff. Though with hg export
        > --git (“fixed” version of the patch) it should not be necessary as
        > empty files do appear in its output.

        Thanks. When I apply both patches "9" and "10", plus this one then the
        tests are passing. I'll send this out as one big patch.

        --
        press CTRL-ALT-DEL for more information

        /// Bram Moolenaar -- Bram@... -- http://www.Moolenaar.net \\\
        /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
        \\\ an exciting new programming language -- http://www.Zimbu.org ///
        \\\ help me help AIDS victims -- http://ICCF-Holland.org ///

        --
        --
        You received this message from the "vim_dev" maillist.
        Do not top-post! Type your reply below the text you are replying to.
        For more information, visit http://www.vim.org/maillist.php

        ---
        You received this message because you are subscribed to the Google Groups "vim_dev" group.
        To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscribe@....
        For more options, visit https://groups.google.com/groups/opt_out.
      • ZyX
        After make ru I find many incorrect fuzzy-matched translations in src/po/ru.po. Am not sure whether the following is the right fix though. # HG changeset
        Message 3 of 25 , Jun 23, 2013
        • 0 Attachment
          After "make ru" I find many incorrect fuzzy-matched translations in src/po/ru.po. Am not sure whether the following is the right fix though.

          # HG changeset patch
          # User ZyX <kp-pav@...>
          # Date 1371999908 -14400
          # Sun Jun 23 19:05:08 2013 +0400
          # Branch python-fixes
          # Node ID 6d47c9fe0c735245337578a76d3ece1c5a4a1b52
          # Parent bec8c9e957010b4a87424de12456d7e98df8776c
          Translation update: replace fuzzy-matched strings found after `make ru` with proper ones

          diff --git a/src/po/ru.po b/src/po/ru.po
          --- a/src/po/ru.po
          +++ b/src/po/ru.po
          @@ -6573,110 +6573,126 @@
          msgid "Need encryption key for \"%s\""
          msgstr "Требуется ключ шифрования для \"%s\""

          +msgid "empty keys are not allowed"
          +msgstr "пустые ключи не допустимы"
          +
          +msgid "dictionary is locked"
          +msgstr "словарь заблокирован"
          +
          +msgid "list is locked"
          +msgstr "список заблокирован"
          +
          +#, c-format
          +msgid "failed to add key '%s' to dictionary"
          +msgstr "не удалось добавить ключ <<%s>> к словарю"
          +
          msgid "can't delete OutputObject attributes"
          msgstr "невозможно удалить атрибуты OutputObject"

          -msgid "softspace must be an integer"
          -msgstr "значение softspace должно быть целым числом"
          -
          -msgid "invalid attribute"
          -msgstr "неправильный атрибут"
          -
          -msgid "writelines() requires list of strings"
          -msgstr "writelines() требует указания списка строк"
          +#, c-format
          +msgid "invalid attribute: %s"
          +msgstr "неправильный атрибут: %s"

          msgid "E264: Python: Error initialising I/O objects"
          msgstr "E264: Python: Ошибка инициализации объектов I/O"

          -msgid "no such buffer"
          -msgstr "нет такого буфера"
          -
          -msgid "empty keys are not allowed"
          -msgstr "пустые ключи не допустимы"
          -
          -msgid "failed to add key to dictionary"
          -msgstr "невозможно добавить ключ к словарю"
          -
          -msgid "Cannot delete DictionaryObject attributes"
          -msgstr "Невозможно удалить атрибуты DictionaryObject"
          -
          -msgid "Cannot modify fixed dictionary"
          -msgstr "Невозможно изменить фиксированный словарь"
          -
          -msgid "Only boolean objects are allowed"
          -msgstr "Разрешено использовать только логические объекты"
          -
          -msgid "Cannot set this attribute"
          -msgstr "Невозможно установить этот атрибут"
          -
          -msgid "no such key in dictionary"
          -msgstr "нет такого ключа в словаре"
          -
          -msgid "dict is locked"
          -msgstr "словарь заблокирован"
          -
          -msgid "internal error: failed to get vim list item"
          -msgstr "внутренняя ошибка: не удалось получить элемент списка VIM"
          -
          -msgid "list is locked"
          -msgstr "список заблокирован"
          -
          -msgid "Failed to add item to list"
          -msgstr "Невозможно добавить элемент в список"
          -
          -msgid "internal error: no vim list item"
          -msgstr "внутренняя ошибка: нет элемента списка VIM"
          -
          -msgid "can only assign lists to slice"
          -msgstr "назначение выборки возможно только для списков"
          +msgid "failed to change directory"
          +msgstr "не удалось изменить текущий каталог"
          +
          +msgid "cannot delete vim.Dictionary attributes"
          +msgstr "невозможно удалить атрибуты vim.Dictionary"
          +
          +msgid "cannot modify fixed dictionary"
          +msgstr "невозможно изменить фиксированный словарь"
          +
          +#, c-format
          +msgid "cannot set attribute %s"
          +msgstr "невозможно установить аттрибут %s"
          +
          +msgid "list index out of range"
          +msgstr "номер элемента за пределами диапазона"
          +
          +#, c-format
          +msgid "internal error: failed to get vim list item %d"
          +msgstr "внутренняя ошибка: не удалось получить элемент %d списка VIM"
          +
          +msgid "failed to add item to list"
          +msgstr "не удалось добавить элемент в список"
          +
          +#, c-format
          +msgid "internal error: no vim list item %d"
          +msgstr "внутренняя ошибка: нет элемента %d списка VIM"

          msgid "internal error: failed to add item to list"
          msgstr "внутренняя ошибка: не удалось добавить элемент в список"

          -msgid "can only concatenate with lists"
          -msgstr "можно объединить только списки"
          -
          -msgid "Cannot modify fixed list"
          -msgstr "Невозможно изменить фиксированный список"
          -
          -msgid "'self' argument must be a dictionary"
          -msgstr "параметр 'self' должен быть словарём"
          -
          -msgid "failed to run function"
          -msgstr "невозможно выполнить функцию"
          +msgid "cannot delete vim.List attributes"
          +msgstr "невозможно удалить атрибуты vim.List"
          +
          +msgid "cannot modify fixed list"
          +msgstr "невозможно изменить фиксированный список"
          +
          +#, c-format
          +msgid "unnamed function %s does not exist"
          +msgstr "анонимная функция %s не существует"
          +
          +#, c-format
          +msgid "function %s does not exist"
          +msgstr "функция %s не существует"
          +
          +#, c-format
          +msgid "failed to run function %s"
          +msgstr "не удалось выполнить функцию %s"
          +
          +msgid "unable to get option value"
          +msgstr "не удалось получить значение настройки"
          +
          +msgid "internal error: unknown option type"
          +msgstr "внутренняя ошибка: неизвестный тип настройки"
          +
          +msgid "attempt to refer to deleted tab page"
          +msgstr "попытка сослаться на уничтоженную вкладку"
          +
          +msgid "no such tab page"
          +msgstr "нет такой вкладки"

          msgid "attempt to refer to deleted window"
          msgstr "попытка сослаться на закрытое окно"

          -msgid "readonly attribute"
          -msgstr "атрибут доступен только для чтения"
          +msgid "readonly attribute: buffer"
          +msgstr "атрибут buffer доступен только для чтения"

          msgid "cursor position outside buffer"
          msgstr "позиция курсора находится вне буфера"

          -#, c-format
          -msgid "<window object (deleted) at %p>"
          -msgstr "<объект окна (удален) в %p>"
          -
          -#, c-format
          -msgid "<window object (unknown) at %p>"
          -msgstr "<объект окна (неизвестен) в %p>"
          -
          -#, c-format
          -msgid "<window %d>"
          -msgstr "<окно %d>"
          -
          msgid "no such window"
          msgstr "нет такого окна"

          msgid "attempt to refer to deleted buffer"
          msgstr "попытка сослаться на уничтоженный буфер"

          -msgid "unable to convert to vim structure"
          -msgstr "невозможно преобразовать в структуру VIM"
          -
          -msgid "NULL reference passed"
          -msgstr "передана ссылка на NULL"
          +msgid "failed to rename buffer"
          +msgstr "не удалось переименовать буфер"
          +
          +msgid "failed to run the code"
          +msgstr "невозможно выполнить функцию"
          +
          +msgid "E858: Eval did not return a valid python object"
          +msgstr "E858: Eval не возвратил допустимого объекта Python"
          +
          +msgid "E859: Failed to convert returned python object to vim value"
          +msgstr "E859: Не удалось преобразовать возвращённый объект Python в значение VIM"
          +
          +#, c-format
          +msgid "unable to convert %s to vim dictionary"
          +msgstr "невозможно преобразовать %s в словарь Vim"
          +
          +#, c-format
          +msgid "unable to convert %s to vim structure"
          +msgstr "невозможно преобразовать %s в структуру Vim"
          +
          +msgid "internal error: NULL reference passed"
          +msgstr "внутренняя ошибка: передана ссылка на NULL"

          msgid "internal error: invalid value type"
          msgstr "внутренняя ошибка: неправильный тип значения"

          --
          --
          You received this message from the "vim_dev" maillist.
          Do not top-post! Type your reply below the text you are replying to.
          For more information, visit http://www.vim.org/maillist.php

          ---
          You received this message because you are subscribed to the Google Groups "vim_dev" group.
          To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscribe@....
          For more options, visit https://groups.google.com/groups/opt_out.
        • Bram Moolenaar
          ... Sergey Alyoshin was maintaining the Russian translations. Sergey, are you OK with including this? -- He was not in the least bit scared to be mashed into a
          Message 4 of 25 , Jun 23, 2013
          • 0 Attachment
            ZyX wrote:

            > After "make ru" I find many incorrect fuzzy-matched translations in
            > src/po/ru.po. Am not sure whether the following is the right fix
            > though.
            >
            > # HG changeset patch
            > # User ZyX <kp-pav@...>
            > # Date 1371999908 -14400
            > # Sun Jun 23 19:05:08 2013 +0400
            > # Branch python-fixes
            > # Node ID 6d47c9fe0c735245337578a76d3ece1c5a4a1b52
            > # Parent bec8c9e957010b4a87424de12456d7e98df8776c
            > Translation update: replace fuzzy-matched strings found after `make
            > ru` with proper ones

            Sergey Alyoshin was maintaining the Russian translations.

            Sergey, are you OK with including this?

            --
            He was not in the least bit scared to be mashed into a pulp
            Or to have his eyes gouged out and his elbows broken;
            To have his kneecaps split and his body burned away
            And his limbs all hacked and mangled, brave Sir Robin.
            "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

            /// Bram Moolenaar -- Bram@... -- http://www.Moolenaar.net \\\
            /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
            \\\ an exciting new programming language -- http://www.Zimbu.org ///
            \\\ help me help AIDS victims -- http://ICCF-Holland.org ///

            --
            --
            You received this message from the "vim_dev" maillist.
            Do not top-post! Type your reply below the text you are replying to.
            For more information, visit http://www.vim.org/maillist.php

            ---
            You received this message because you are subscribed to the Google Groups "vim_dev" group.
            To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscribe@....
            For more options, visit https://groups.google.com/groups/opt_out.
          Your message has been successfully submitted and would be delivered to recipients shortly.