ibus-typing-booster August 2016

ibus-typing-booster@lists.fedorahosted.org

1 participants
41 discussions

How to install?
by Thomas Güttler 20 Jan '17

20 Jan '17

How to install ibus-typing-booster on Ubuntu 14.04 (LTS)? This page is unfortunately empty: http://typingbooster.org/howtoinstall/ Regards, Thomas Güttler PS: I have seen only commits on this list, not discussion. Am I wrong here? -- http://www.thomas-guettler.de/

2 1

[ibus-typing-booster] master: Release 1.5.1 (e7c1d3f)
by mfabian＠fedoraproject.org 29 Aug '16

29 Aug '16

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : master >--------------------------------------------------------------- commit e7c1d3f2c813ceb7afaaac8ac58be139932999e4 Author: Mike FABIAN <mfabian(a)redhat.com> Date: Fri Aug 12 19:04:51 2016 +0200 Release 1.5.1 >--------------------------------------------------------------- ChangeLog | 9 +++++++++ configure.ac | 2 +- ibus-typing-booster.pc.in | 2 +- typing-booster.appdata.xml | 23 +++++++++++++++++++++++ 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a190a03..e51197f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,13 @@ * Author: Mike FABIAN <mfabian(a)redhat.com> +* 29 Aug 2016 Released 1.5.1 version +* If the query string in EmojiMatcher.candidates() is an emoji itself, match similar ones +* Data files should not be stored gzipped in the repository +* Change displayed input method name from ��Hunspell�� to ��Typing Booster�� +* Use Zanata to get more translations +* French translations added (100% translated) +* Polish translations added (100% translated) + +* Author: Mike FABIAN <mfabian(a)redhat.com> * 10 Aug 2016 Released 1.5.0 version * If the lookup table shows related words, ��Escape�� shows the original lookup table * Use itb_nltk.py to find related words (synonyms, hypernyms, and hyponyms) diff --git a/configure.ac b/configure.ac index 3402e75..8bf572e 100755 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ m4_define([package_name], [ibus-typing-booster]) m4_define([ibus_released], [1]) m4_define([ibus_major_version], [1]) m4_define([ibus_minor_version], [5]) -m4_define([ibus_micro_version], [0]) +m4_define([ibus_micro_version], [1]) m4_define(ibus_maybe_datestamp, m4_esyscmd([if test x]ibus_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi])) diff --git a/ibus-typing-booster.pc.in b/ibus-typing-booster.pc.in index 582c095..402fe87 100755 --- a/ibus-typing-booster.pc.in +++ b/ibus-typing-booster.pc.in @@ -11,7 +11,7 @@ enginedir=/usr/share/ibus/engine Name: IBus-Typing-Booster Description: Table Based Input Method Framework for Intelligent Input Bus for Linux / Unix OS -Version: 1.5.0 +Version: 1.5.1 Requires: Libs: Cflags: diff --git a/typing-booster.appdata.xml b/typing-booster.appdata.xml index 16e9961..5b96634 100644 --- a/typing-booster.appdata.xml +++ b/typing-booster.appdata.xml @@ -16,6 +16,29 @@ <url type="bugtracker">https://github.com/mike-fabian/ibus-typing-booster/issues</url> <url type="help">https://mike-fabian.github.io/ibus-typing-booster/documentation.html</url> <releases> + <release version="1.5.1" date="2016-08-29" urgency="medium"> + <description> + <ul> + <li> + If the query string in EmojiMatcher.candidates() is an + emoji itself, match similar ones. + </li> + <li> + Data files should not be stored gzipped in the repository. + </li> + <li> + Change displayed input method name from ��Hunspell�� to. + ��Typing Booster�� + </li> + <li> + French translations added (100% translated). + </li> + <li> + Polish translations added (100% translated). + </li> + </ul> + </description> + </release> <release version="1.5.0" date="2016-08-10" urgency="medium"> <description> <ul>

1 0

[ibus-typing-booster] master: Add Polish translations from zanata, 100% translated. (2f19dfa)
by mfabian＠fedoraproject.org 29 Aug '16

29 Aug '16

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : master >--------------------------------------------------------------- commit 2f19dfa30d6145260e7e038112c4ab59bd41f0ee Author: Mike FABIAN <mfabian(a)redhat.com> Date: Mon Aug 29 09:57:12 2016 +0200 Add Polish translations from zanata, 100% translated. >--------------------------------------------------------------- po/LINGUAS | 1 + po/{ca.po => pl.po} | 139 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 83 insertions(+), 57 deletions(-) diff --git a/po/LINGUAS b/po/LINGUAS index 339c67b..7315c28 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -3,3 +3,4 @@ ca de fr +pl diff --git a/po/ca.po b/po/pl.po similarity index 55% copy from po/ca.po copy to po/pl.po index 5b650b8..66c1c84 100644 --- a/po/ca.po +++ b/po/pl.po @@ -1,4 +1,4 @@ -# Mike FABIAN <mfabian(a)redhat.com>, 2016. #zanata +# Piotr Dr��g <piotrdrag(a)gmail.com>, 2016. #zanata msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -8,159 +8,167 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2016-08-19 04:06-0400\n" -"Last-Translator: Copied by Zanata <copied-by-zanata(a)zanata.org>\n" -"Language-Team: Catalan\n" -"Language: ca\n" +"PO-Revision-Date: 2016-08-25 07:56-0400\n" +"Last-Translator: Piotr Dr��g <piotrdrag(a)gmail.com>\n" +"Language-Team: Polish\n" +"Language: pl\n" "X-Generator: Zanata 3.9.3\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2)\n" #: engine/hunspell_table.py:836 #, python-format msgid "Switch preedit input method to %(ime)s" msgstr "" +"Prze��cz metod�� wprowadzania wcze��niej wprowadzonego tekstu na %(ime)s" #: engine/hunspell_table.py:844 -#, fuzzy msgid "Preedit input method" -msgstr "M��tode d'entrada:" +msgstr "Metoda wprowadzania wcze��niej wprowadzonego tekstu" #: engine/hunspell_table.py:845 msgid "Switch preedit input method" -msgstr "" +msgstr "Prze��cz metod�� wprowadzania wcze��niej wprowadzonego tekstu" #: engine/hunspell_table.py:936 msgid "Setup" -msgstr "Prefer��ncies" +msgstr "Ustawienia" #: engine/hunspell_table.py:939 #, python-format msgid "Configure ibus-typing-booster ��%(name)s��" -msgstr "Prefer��ncies per a l'ibus-typing-booster ��%(name)s��" +msgstr "Skonfiguruj ibus-typing-booster ��%(name)s��" #: setup/main.py:101 #, python-format msgid "Unknown format of engine name: IBUS_ENGINE_NAME=%(name)s" -msgstr "Format desconegut del nom del motor: IBUS_ENGINE_NAME=%(name)s" +msgstr "Nieznany format nazwy mechanizmu: IBUS_ENGINE_NAME=%(name)s" #: setup/main.py:107 msgid "IBUS_ENGINE_NAME environment variable is not set." -msgstr "La variable d'entorn IBUS_ENGINE_NAME no est�� establerta." +msgstr "Nie ustawiono zmiennej ��rodowiskowej IBUS_ENGINE_NAME" #: setup/main.py:111 msgid "" "Cannot determine the config file for this engine. Please use the --config-" "file option." msgstr "" -"No es pot determinar cap fitxer de configuraci�� per a aquest motor. Si us " -"plau, utilitzeu l'opci�� --config-file." +"Nie mo��na ustali�� pliku konfiguracji dla tego mechanizmu. Prosz�� u��y�� opcji " +"��--config-file��." #: setup/main.py:121 #, python-format msgid "Config file %(file)s does not exist." -msgstr "El fitxer de configuraci�� %(file)s no existeix." +msgstr "Plik konfiguracji %(file)s nie istnieje." #: setup/main.py:139 #, python-format msgid "Preferences for ibus-typing-booster \"%(symbol)s\"" -msgstr "Prefer��ncies per a l'ibus-typing-booster \"%(symbol)s\"" +msgstr "Preferencje dla ibus-typing-booster ��%(symbol)s��" #: setup/main.py:325 msgid "Another instance of this app is already running." -msgstr "Ja s'est�� executant una altra inst��ncia d'aquesta aplicaci��." +msgstr "Inna kopia tej aplikacji jest ju�� uruchomiona." #: setup/main.py:420 msgid "Open File ..." -msgstr "Obre el fitxer..." +msgstr "Otw��rz plik��" #: setup/main.py:438 #, python-format msgid "Learned successfully from file %(filename)s." -msgstr "S'ha apr��s correctament del fitxer %(filename)s." +msgstr "Pomy��lnie nauczono si�� z pliku %(filename)s." #: setup/main.py:447 #, python-format msgid "Learning from file %(filename)s failed." -msgstr "Ha fallat l'aprenentatge del fitxer %(filename)s." +msgstr "Nauczenie si�� z pliku %(filename)s si�� nie powiod��o." #: setup/main.py:456 msgid "Are you sure?" -msgstr "Esteu segur?" +msgstr "Na pewno?" #: setup/main.py:463 msgid "" "Do you really want to delete all language \n" "data learned from typing or reading files?" msgstr "" -"Realment voleu eliminar totes les dades de l'idioma \n" -"que s'han apr��s de l'escriptura o la lectura de fitxers? " +"Na pewno usun�� wszystkie dane j��zyk��w\n" +"nauczone podczas pisania i odczytywania plik��w?" #: setup/main.py:660 msgid "ibus is not running." -msgstr "ibus no s'est�� executant." +msgstr "Us��uga IBus nie jest uruchomiona." #: setup/setup.glade:35 msgid "Close" -msgstr "Tanca" +msgstr "Zamknij" #: setup/setup.glade:83 msgid "Enable suggestions by Tab key" -msgstr "Habilita els suggeriments amb la tecla Tab" +msgstr "W��czenie sugestii za pomoc�� klawisza Tab" #: setup/setup.glade:87 msgid "Toggle whether a list of suggestions pops up with the Tab key." -msgstr "" +msgstr "Prze��czenie wy��wietlania listy sugestii za pomoc�� klawisza Tab." #: setup/setup.glade:107 msgid "" "How many suggestion candidates to show in one page of the candidate list." msgstr "" +"Ile kandydat��w sugestii wy��wietla�� na jednej stronie listy kandydat��w." #: setup/setup.glade:108 msgid "Candidate window page size:" -msgstr "Mida de la p��gina de la finestra dels candidats:" +msgstr "Rozmiar strony okna kandydata:" #: setup/setup.glade:144 msgid "" "The input method to use. See also the option ��Add direct input�� to add " "British English as a second language." msgstr "" +"U��ywana metoda wprowadzania. Opcja ��Dodanie bezpo��redniego wprowadzania�� " +"umo��liwia dodanie brytyjskiego angielskiego jako drugiego j��zyka." #: setup/setup.glade:145 msgid "Input Method:" -msgstr "M��tode d'entrada:" +msgstr "Metoda wprowadzania:" #: setup/setup.glade:170 msgid "Display total number of candidates" -msgstr "Mostra el nombre total de candidats" +msgstr "Wy��wietlanie ca��kowitej liczby kandydat��w" #: setup/setup.glade:174 msgid "" "Display how many candidates there are and which one is selected on top of " "the list of candidates." msgstr "" +"Wy��wietlanie tylu kandydat��w, ile istnieje, i kt��ry jest wybrany na g��rze " +"listy kandydat��w." #: setup/setup.glade:196 msgid "" "Show no suggestions when less than this number of characters have been typed." "" -msgstr "" +msgstr "Bez wy��wietlania sugestii, kiedy wpisano mniej ni�� t�� liczb�� znak��w." #: setup/setup.glade:197 msgid "Minimum number of chars for completion:" -msgstr "Nombre m��xim de car��cter per a la conclusi��:" +msgstr "Minimalna liczba znak��w do uzupe��niania:" #: setup/setup.glade:230 msgid "Input Method Help" -msgstr "Ajuda del m��tode d'entrada" +msgstr "Pomoc metody wprowadzania" #: setup/setup.glade:234 msgid "Display some help showing how to use the input method selected above." msgstr "" +"Wy��wietlanie pomocy pokazuj��cej, jak u��ywa�� metody wprowadzania wybranej " +"powy��ej." #: setup/setup.glade:245 msgid "Use digits as select keys" -msgstr "" +msgstr "U��ycie cyfr jako klawiszy wyboru" #: setup/setup.glade:249 msgid "" @@ -172,21 +180,32 @@ msgid "" "enabled select keys F1-F9 as the latter keys are farther away from the " "fingers." msgstr "" +"U��ywa zwyk��ych klawiszy cyfr 1-9 jako klawiszy wyboru. Je��li ta opcja jest " +"w��czona, to liczby mog�� by�� wprowadzane tylko, kiedy ��adne sugestie nie s�� " +"wy��wietlane. Z tego powodu nie mo��na sugerowa�� uzupe��nie�� liczb, a pisanie " +"s��w zawieraj��cych liczby, takich jak ��A4��, jest trudniejsze, poniewa�� " +"wpisanie ��4�� spowodowa��oby wybranie czwartej sugestii. Z drugiej strony, " +"wybieranie sugestii u��ywaj��c klawiszy 1-9 jest ��atwiejsze ni�� u��ywanie " +"zawsze w��czonych klawiszy wyboru F1-F9, poniewa�� te drugie s�� dalej od " +"palc��w." #: setup/setup.glade:263 msgid "Add direct input" -msgstr "" +msgstr "Dodanie bezpo��redniego wprowadzania" #: setup/setup.glade:267 msgid "" "This option adds British English as a second language to use in addition to " "the main language of this input method." msgstr "" +"Ta opcja dodaje brytyjski angielski jako drugi u��ywany j��zyk, w dodatku do " +"g��wnego j��zyka tej metody wprowadzania." #: setup/setup.glade:281 -#, fuzzy msgid "Remember last used preedit input method" -msgstr "M��tode d'entrada:" +msgstr "" +"Zapami��tanie ostatnio u��ywanej metody wprowadzania wcze��niej wprowadzonego " +"tekstu" #: setup/setup.glade:285 msgid "" @@ -195,68 +214,70 @@ msgid "" "via the menu or via shortcut keys. If this option is enabled, such a change " "is remembered even if the session is restarted. " msgstr "" +"Je��li wi��cej ni�� jedna metoda wprowadzania jest u��ywana w tym samym czasie, " +"to jedna z nich jest u��ywana do wcze��niejszego wprowadzania. Kt��ra metoda " +"jest u��ywana do wcze��niejszego wprowadzania mo��e by�� zmieniane w menu lub za " +"pomoc�� skr��t��w klawiszowych. Je��li ta opcja jest w��czona, to ta zmiana jest " +"zapami��tywana nawet po ponownym uruchomieniu sesji." #: setup/setup.glade:299 msgid "Emoji predictions" -msgstr "" +msgstr "Przewidywanie emoji" #: setup/setup.glade:303 msgid "Whether emoji should be included in the predictions." -msgstr "" +msgstr "Czy uwzgl��dnia�� emoji w przewidywaniach." #: setup/setup.glade:342 msgid "Options" -msgstr "Opcions" +msgstr "Opcje" #: setup/setup.glade:375 msgid "Install dictionary" -msgstr "Instal��la el diccionari" +msgstr "Zainstaluj s��ownik" #: setup/setup.glade:389 msgid "Install pyhunspell" -msgstr "Instal��la pyhunspell" +msgstr "Zainstaluj pakiet pyhunspell" #: setup/setup.glade:405 msgid "Learn from text file" -msgstr "Apr��n del fitxer de text" +msgstr "Naucz si�� z pliku tekstowego" #: setup/setup.glade:423 msgid "Install the dictionary package for this engine" -msgstr "Instal��la el paquet del diccionari per a aquest motor" +msgstr "Instaluje pakiet s��ownika dla tego mechanizmu" #: setup/setup.glade:433 msgid "Install pyhunspell package to get spellchecking suggestions" -msgstr "" -"Instal��la el paquet pyhunspell per obtenir els suggeriments de la revisi�� " -"ortogr��fica" +msgstr "Instaluje pakiet pyhunspell dla sugestii sprawdzania pisowni" #: setup/setup.glade:447 msgid "Learn your style by reading a text file" -msgstr "Apr��n el vostre estil amb la lectura d'un fitxer de text" +msgstr "Uczy si�� stylu odczytuj��c plik tekstowy" #: setup/setup.glade:461 msgid "" "Delete all personal language data learned from typing or from reading files" msgstr "" -"Elimina totes les dades de l'idioma personal que s'han apr��s de l'escriptura " -"o de la lectura de fitxers" +"Usuwa wszystkie osobiste dane j��zyka nauczone podczas pisania lub " +"odczytywania plik��w" #: setup/setup.glade:473 msgid "Delete learned data" -msgstr "Elimina les dades que s'han apr��s" +msgstr "Usuwa nauczone dane" #: setup/setup.glade:510 msgid "Dictionaries and personal data" -msgstr "Diccionaris i dades personals" +msgstr "S��owniki i dane osobiste" #: typing-booster.appdata.xml:5 msgid "Typing Booster" -msgstr "" +msgstr "Wspieranie pisania" #: typing-booster.appdata.xml:6 -#, fuzzy msgid "Predictive input method" -msgstr "M��tode d'entrada:" +msgstr "Przewiduj��ca metoda wprowadzania" #: typing-booster.appdata.xml:8 msgid "" @@ -264,7 +285,11 @@ msgid "" "based on context and partial input. One can then simply select the desired " "word from a list of suggestions and improve one��s typing speed and spelling." msgstr "" +"ibus-typing-booster to przewiduj��ca metoda wprowadzania, przewiduj��ca ca��e " +"s��owa w oparciu o kontekst i cz��ciowo wprowadzone s��owa. Mo��na po prostu " +"wybiera�� dane s��owa z listy sugestii i dzi��ki temu zwi��kszy�� swoj�� " +"pr��dko�� i dok��adno�� pisania." #: typing-booster.appdata.xml:92 msgid "Mike FABIAN" -msgstr "" +msgstr "Mike FABIAN"

1 0

[ibus-typing-booster] master: Pull fr.po from zanata, 100% translated (c8b078b)
by mfabian＠fedoraproject.org 29 Aug '16

29 Aug '16

1 0

[ibus-typing-booster] master: Specify IBus and Gtk versions before importing (3024e51)
by mfabian＠fedoraproject.org 29 Aug '16

29 Aug '16

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : master >--------------------------------------------------------------- commit 3024e51864f0c58cabd777dae45cbed362153d2a Author: Mike FABIAN <mfabian(a)redhat.com> Date: Wed Aug 24 08:15:32 2016 +0200 Specify IBus and Gtk versions before importing >--------------------------------------------------------------- engine/factory.py | 2 ++ engine/hunspell_table.py | 2 ++ engine/main.py | 2 ++ setup/main.py | 12 +++++++----- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/engine/factory.py b/engine/factory.py index dd4c260..9eb9377 100755 --- a/engine/factory.py +++ b/engine/factory.py @@ -18,6 +18,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/> +from gi import require_version +require_version('IBus', '1.0') from gi.repository import IBus import hunspell_table import tabsqlitedb diff --git a/engine/hunspell_table.py b/engine/hunspell_table.py index 8c9a6b7..05a4123 100644 --- a/engine/hunspell_table.py +++ b/engine/hunspell_table.py @@ -26,6 +26,8 @@ import sys import string import unicodedata import re +from gi import require_version +require_version('IBus', '1.0') from gi.repository import IBus from gi.repository import GLib from m17n_translit import Transliterator diff --git a/engine/main.py b/engine/main.py index 1bb4df8..7c96f39 100755 --- a/engine/main.py +++ b/engine/main.py @@ -19,6 +19,8 @@ import os import sys import optparse +from gi import require_version +require_version('IBus', '1.0') from gi.repository import IBus from gi.repository import GLib import re diff --git a/setup/main.py b/setup/main.py index ccdebae..1e7b5fa 100644 --- a/setup/main.py +++ b/setup/main.py @@ -28,6 +28,13 @@ import locale from time import strftime from i18n import DOMAINNAME, _, N_, init as i18n_init import dbus, dbus.service, dbus.glib +from gi import require_version +require_version('Gtk', '3.0') +from gi.repository import Gtk +require_version('IBus', '1.0') +from gi.repository import IBus +from gi.repository import GLib +from pkginstall import InstallPkg sys.path = [sys.path[0]+'/../engine'] + sys.path import tabsqlitedb @@ -64,11 +71,6 @@ if options.debug: sys.stderr = open(logfile, mode='a', buffering=1) print('--- %s ---' %strftime('%Y-%m-%d: %H:%M:%S')) -from gi.repository import Gtk -from gi.repository import IBus -from gi.repository import GLib -from pkginstall import InstallPkg - class SetupUI: def __init__(self, bus): filename = path.join(path.dirname(__file__),"setup.glade")

1 0

[ibus-typing-booster] master: Add a helper function itb_util.remove_accents() (345baee)
by mfabian＠fedoraproject.org 29 Aug '16

29 Aug '16

1 0

[ibus-typing-booster] master: Remove ��u�� in front of strings (Redundant in Python3) (6f9f1d8)
by mfabian＠fedoraproject.org 29 Aug '16

29 Aug '16

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : master >--------------------------------------------------------------- commit 6f9f1d85ced22f786b6d716a10e00534aaf6e8c6 Author: Mike FABIAN <mfabian(a)redhat.com> Date: Mon Aug 29 07:58:23 2016 +0200 Remove ��u�� in front of strings (Redundant in Python3) >--------------------------------------------------------------- engine/hunspell_suggest.py | 4 +- engine/hunspell_table.py | 54 ++++++++++++++++++++++---------------------- engine/m17n_translit.py | 2 +- engine/tabsqlitedb.py | 36 ++++++++++++++-------------- 4 files changed, 48 insertions(+), 48 deletions(-) diff --git a/engine/hunspell_suggest.py b/engine/hunspell_suggest.py index 3e238e6..6fd6a61 100755 --- a/engine/hunspell_suggest.py +++ b/engine/hunspell_suggest.py @@ -48,7 +48,7 @@ max_words_row = 50 normalization_form_internal = 'NFD' class Dictionary: - def __init__(self, name=u'en_US'): + def __init__(self, name = 'en_US'): if debug_level > 1: sys.stderr.write( "Dictionary.__init__(name=%s)\n" %name) @@ -249,7 +249,7 @@ class Hunspell: dic_path = os.path.join(dictionary.loc, dictionary.name+'.dic') suggested_words.insert( 0, - u'�� %(dic_path)s not found. ' + '�� %(dic_path)s not found. ' %{'dic_path': dic_path} + 'Please install hunspell dictionary!') return suggested_words[0:max_words] diff --git a/engine/hunspell_table.py b/engine/hunspell_table.py index ffe29d9..c3b0759 100644 --- a/engine/hunspell_table.py +++ b/engine/hunspell_table.py @@ -133,8 +133,8 @@ class editor(object): self._typed_string = [] self._typed_string_cursor = 0 self._typed_string_when_update_candidates_was_last_called = [] - self._p_phrase = u'' - self._pp_phrase = u'' + self._p_phrase = '' + self._pp_phrase = '' # self._candidates: hold candidates selected from database and hunspell self._candidates = [] self._lookup_table = lookup_table @@ -241,7 +241,7 @@ class editor(object): self._typed_string_cursor = 0 self._typed_string_when_update_candidates_was_last_called = [] for ime in self._current_imes: - self._transliterated_strings[ime] = u'' + self._transliterated_strings[ime] = '' def update_transliterated_strings(self): self._transliterated_strings = {} @@ -376,7 +376,7 @@ class editor(object): return len(transliterated_string_up_to_cursor) def append_candidate_to_lookup_table( - self, phrase=u'', user_freq=0, comment=''): + self, phrase = '', user_freq = 0, comment = ''): '''append candidate to lookup_table''' if not phrase: return @@ -396,7 +396,7 @@ class editor(object): # of the transliterations of the user input, i.e. it must # be a spelling correction suggestion: if debug_level > 0: - phrase = phrase + u' ��' + phrase = phrase + ' ��' attrs.append(IBus.attr_foreground_new( rgb(0xff, 0x00, 0x00), 0, len(phrase))) elif user_freq > 10: @@ -409,7 +409,7 @@ class editor(object): attrs.append(IBus.attr_foreground_new( rgb(0x00, 0x00, 0x00), 0, len(phrase))) if debug_level > 0: - phrase += u' ' + str(user_freq) + phrase += ' ' + str(user_freq) attrs.append(IBus.attr_foreground_new( rgb(0x00, 0xff, 0x00), len(phrase) - len(str(user_freq)), @@ -446,7 +446,7 @@ class editor(object): if self._transliterated_strings[ime]: candidates = [] prefix_length = 0 - prefix = u'' + prefix = '' stripped_transliterated_string = ( itb_util.lstrip_token(self._transliterated_strings[ime])) if (len(stripped_transliterated_string) @@ -565,14 +565,14 @@ class editor(object): has the index 0 and has the label ��1.��. ''' if not self._candidates: - return u'' + return '' cursor_pos = self._lookup_table.get_cursor_pos() cursor_in_page = self._lookup_table.get_cursor_in_page() current_page_start = cursor_pos - cursor_in_page real_index = current_page_start + index if real_index >= len (self._candidates): # the index given is out of range - return u'' + return '' return self._candidates[real_index][0] def get_string_from_lookup_table_cursor_pos(self): @@ -581,11 +581,11 @@ class editor(object): table. ''' if not self._candidates: - return u'' + return '' index = self._lookup_table.get_cursor_pos() if index >= len (self._candidates): # the index given is out of range - return u'' + return '' return self._candidates[index][0] def remove_candidate_from_user_database (self, index): @@ -689,8 +689,8 @@ class editor(object): self._p_phrase = phrase def clear_context(self): - self._pp_phrase = u'' - self._p_phrase = u'' + self._pp_phrase = '' + self._p_phrase = '' ######################## ### Engine Class ##### @@ -934,7 +934,7 @@ class tabengine (IBus.Engine): self.preedit_ime_menu, current_mode = 0) self._setup_property = IBus.Property( - key = u'setup', + key = 'setup', label = IBus.Text.new_from_string(_('Setup')), icon = 'gtk-preferences', tooltip = IBus.Text.new_from_string( @@ -1007,9 +1007,9 @@ class tabengine (IBus.Engine): _str = unicodedata.normalize( 'NFC', self._editor.get_transliterated_strings()[ self.get_current_imes()[0]]) - if _str == u'': + if _str == '': super(tabengine, self).update_preedit_text( - IBus.Text.new_from_string(u''), 0, False) + IBus.Text.new_from_string(''), 0, False) else: attrs = IBus.AttrList() attrs.append(IBus.attr_underline_new( @@ -1028,14 +1028,14 @@ class tabengine (IBus.Engine): def _update_aux (self): '''Update Aux String in UI''' - aux_string = u'' + aux_string = '' if self._show_number_of_candidates: - aux_string = u'(%d / %d) ' % ( + aux_string = '(%d / %d) ' % ( self._editor.get_lookup_table().get_cursor_pos() + 1, self._editor.get_lookup_table().get_number_of_candidates()) preedit_ime = self.get_current_imes()[0] if preedit_ime != 'NoIme': - aux_string += preedit_ime + u' ' + aux_string += preedit_ime + ' ' # Colours do not work at the moment in the auxiliary text! # Needs fix in ibus. attrs = IBus.AttrList() @@ -1045,8 +1045,8 @@ class tabengine (IBus.Engine): len(aux_string))) if debug_level > 0: context = ( - u'Context: ' + self._editor.get_pp_phrase() - + u' ' + self._editor.get_p_phrase()) + 'Context: ' + self._editor.get_pp_phrase() + + ' ' + self._editor.get_p_phrase()) aux_string += context attrs.append(IBus.attr_foreground_new( rgb(0x00, 0xff, 0x00), @@ -1161,7 +1161,7 @@ class tabengine (IBus.Engine): "has_transliteration(%s) == False\n" %msymbol_list) return False - def commit_string (self, commit_phrase, input_phrase=u''): + def commit_string (self, commit_phrase, input_phrase = ''): if not input_phrase: input_phrase = self._editor.get_transliterated_strings()[ self.get_current_imes()[0]] @@ -1252,7 +1252,7 @@ class tabengine (IBus.Engine): def do_candidate_clicked(self, index, dummy_button, dummy_state): phrase = self._editor.get_string_from_lookup_table_current_page(index) if phrase: - self.commit_string(phrase + u' ') + self.commit_string(phrase + ' ') def do_process_key_event(self, keyval, keycode, state): '''Process Key Events @@ -1501,7 +1501,7 @@ class tabengine (IBus.Engine): self._editor.get_string_from_lookup_table_current_page( index)) if phrase: - self.commit_string(phrase + u' ') + self.commit_string(phrase + ' ') return True if key.val == IBus.KEY_F12 and key.mod1 and not self._editor.is_empty(): @@ -1525,7 +1525,7 @@ class tabengine (IBus.Engine): phrase = ( self._editor.get_string_from_lookup_table_cursor_pos()) if phrase: - self.commit_string(phrase + u' ') + self.commit_string(phrase + ' ') return True else: input_phrase = ( @@ -1533,7 +1533,7 @@ class tabengine (IBus.Engine): self.get_current_imes()[0]]) if input_phrase: self.commit_string( - input_phrase + u' ', input_phrase = input_phrase) + input_phrase + ' ', input_phrase = input_phrase) return True return True @@ -1681,7 +1681,7 @@ class tabengine (IBus.Engine): and input_phrase[-1] == key.msymbol and self.get_current_imes()[0] == 'NoIme'): self.commit_string( - input_phrase + u' ', input_phrase = input_phrase) + input_phrase + ' ', input_phrase = input_phrase) self._update_ui() return True diff --git a/engine/m17n_translit.py b/engine/m17n_translit.py index 119beea..97fe0e6 100644 --- a/engine/m17n_translit.py +++ b/engine/m17n_translit.py @@ -301,7 +301,7 @@ class Transliterator: if type(msymbol_list) != type([]): raise ValueError('Argument of transliterate() must be a list.') if self._dummy: - return u''.join(msymbol_list) + return ''.join(msymbol_list) libm17n__minput_reset_ic(self._ic) output = '' for symbol in msymbol_list + ['nil']: diff --git a/engine/tabsqlitedb.py b/engine/tabsqlitedb.py index caadd5f..ddca822 100755 --- a/engine/tabsqlitedb.py +++ b/engine/tabsqlitedb.py @@ -249,8 +249,8 @@ class tabsqlitedb: sqlargs.append( {'input_phrase': x[0], 'phrase': x[0], - 'p_phrase': u'', - 'pp_phrase': u'', + 'p_phrase': '', + 'pp_phrase': '', 'user_freq': x[1], 'timestamp': time.time()}) sqlstr = ''' @@ -283,8 +283,8 @@ class tabsqlitedb: self.create_indexes("user_db", commit=False) self.generate_userdb_desc() - def update_phrase(self, input_phrase=u'', phrase=u'', - p_phrase=u'', pp_phrase=u'', + def update_phrase(self, input_phrase = '', phrase = '', + p_phrase = '', pp_phrase = '', user_freq=0, database='user_db', commit=True): ''' update the user frequency of a phrase @@ -348,8 +348,8 @@ class tabsqlitedb: self.db.execute(sqlstr) self.db.commit() - def add_phrase(self, input_phrase=u'', phrase=u'', - p_phrase=u'', pp_phrase=u'', + def add_phrase(self, input_phrase = '', phrase = '', + p_phrase = '', pp_phrase = '', user_freq=0, database = 'main', commit=True): ''' Add phrase to database @@ -452,7 +452,7 @@ class tabsqlitedb: x[0] # phrase alphabetical ))[:20] - def select_words(self, input_phrase, p_phrase=u'', pp_phrase=u''): + def select_words(self, input_phrase, p_phrase = '', pp_phrase = ''): ''' Get phrases from database completing input_phrase. @@ -484,7 +484,7 @@ class tabsqlitedb: %self.best_candidates(phrase_frequencies)) # Now phrase_frequencies might contain something like this: # - # {u'code': 0, u'communicability': 0, u'cold': 0, u'colour': 0} + # {'code': 0, 'communicability': 0, 'cold': 0, 'colour': 0} # To quote a string to be used as a parameter when assembling # an sqlite statement with Python string operations, remove @@ -524,7 +524,7 @@ class tabsqlitedb: results_uni = self.db.execute(sqlstr, sqlargs).fetchall() # Then the result returned by .fetchall() is: # - # [(u'colour', 4), (u'cold', 1), (u'conspiracy', 6)] + # [('colour', 4), ('cold', 1), ('conspiracy', 6)] # # (��c|conspiracy|1�� is not selected because it doesn��t # match the user input ��LIKE co%��! I.e. this is filtered @@ -540,7 +540,7 @@ class tabsqlitedb: # Now normalize the unigram frequencies with the total count # (which is 11 in the above example), which gives us the # normalized result: - # [(u'colour', 4/11), (u'cold', 1/11), (u'conspiracy', 6/11)] + # [('colour', 4/11), ('cold', 1/11), ('conspiracy', 6/11)] sqlstr = 'SELECT sum(user_freq) FROM like_input_phrase_view;' try: count = self.db.execute(sqlstr, sqlargs).fetchall()[0][0] @@ -548,8 +548,8 @@ class tabsqlitedb: import traceback traceback.print_exc() # Updating the phrase_frequency dictionary with the normalized - # results gives: {u'conspiracy': 6/11, u'code': 0, - # u'communicability': 0, u'cold': 1/11, u'colour': 4/11} + # results gives: {'conspiracy': 6/11, 'code': 0, + # 'communicability': 0, 'cold': 1/11, 'colour': 4/11} for x in results_uni: phrase_frequencies.update([(x[0], x[1]/float(count))]) if debug_level > 1: @@ -714,8 +714,8 @@ CREATE TABLE phrases (id INTEGER PRIMARY KEY, input_phrase TEXT, phrase TEXT, p_ return 0 def check_phrase_and_update_frequency( - self, input_phrase=u'', phrase=u'', p_phrase=u'', - pp_phrase=u'', database='user_db', commit=True): + self, input_phrase = '', phrase = '', p_phrase = '', + pp_phrase = '', database = 'user_db', commit=True): ''' Check whether input_phrase and phrase are already in database. If they are in the database, increase the frequency by 1, if not @@ -792,8 +792,8 @@ CREATE TABLE phrases (id INTEGER PRIMARY KEY, input_phrase TEXT, phrase TEXT, p_ commit=commit) return - def remove_phrase(self, input_phrase=u'', - phrase=u'', database='user_db', commit=True): + def remove_phrase(self, input_phrase = '', + phrase = '', database = 'user_db', commit = True): ''' Remove all rows matching ��input_phrase�� and ��phrase�� from database. Or, if ��input_phrase�� is ��None��, remove all rows matching ��phrase�� @@ -855,8 +855,8 @@ CREATE TABLE phrases (id INTEGER PRIMARY KEY, input_phrase TEXT, phrase TEXT, p_ rows = self.db.execute( 'SELECT input_phrase, phrase, p_phrase, pp_phrase, ' + 'user_freq, timestamp FROM phrases;').fetchall() - p_token = u'' - pp_token = u'' + p_token = '' + pp_token = '' database_dict = {} for x in rows: database_dict.update([((x[0], x[1], x[2], x[3]),

1 0

[ibus-typing-booster] master: Remove '/' and following flags immediately when loading a dictionary buffer (13f9c70)
by mfabian＠fedoraproject.org 29 Aug '16

29 Aug '16

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : master >--------------------------------------------------------------- commit 13f9c705892e098531a19720c89b74dd355e7c97 Author: Mike FABIAN <mfabian(a)redhat.com> Date: Sun Aug 28 21:41:38 2016 +0200 Remove '/' and following flags immediately when loading a dictionary buffer We don��t use the flags at the moment anyway. Keeping them in the buffer just makes the buffer a bit larger and the regular expressions to match words in the buffer more complicated. >--------------------------------------------------------------- engine/hunspell_suggest.py | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 deletions(-) diff --git a/engine/hunspell_suggest.py b/engine/hunspell_suggest.py index 6fd6a61..13c14fd 100755 --- a/engine/hunspell_suggest.py +++ b/engine/hunspell_suggest.py @@ -112,6 +112,19 @@ class Dictionary: print("load_dictionary(): " + "Successfully loaded %(dic)s using %(enc)s encoding." %{'dic': dic_path, 'enc': self.encoding}) + # http://pwet.fr/man/linux/fichiers_speciaux/hunspell says: + # + # > A dictionary file (*.dic) contains a list of words, one per + # > line. The first line of the dictionaries (except personal + # > dictionaries) contains the word count. Each word may + # > optionally be followed by a slash ("/") and one or more + # > flags, which represents affixes or special attributes. + # + # Therefore, remove '/' and the following flags from each + # line to make the buffer a bit smaller and the regular + # expressions we use later to match words in the + # dictionary slightly simpler and maybe a tiny bit faster: + self.buffer = re.sub(r'/.*', '', self.buffer) self.buffer = unicodedata.normalize( normalization_form_internal, self.buffer) if import_enchant_successful: @@ -187,12 +200,13 @@ class Hunspell: # immediately: if '/' in input_phrase: return [] - # And we should not match further than '/'. - # Take care to use a non-greedy regexp to match only - # one line and not accidentally big chunks of the file! + # '/' is already removed from the buffer, we do not need to + # take care of it in the regexp. Take care to use a + # non-greedy regexp to match only one line and not + # accidentally big chunks of the file! try: - regexp = r'^'+re.escape(input_phrase)+r'.*?(?=/|$)' - patt_start = re.compile(regexp, re.MULTILINE) + patt_start = re.compile(r'^' + re.escape(input_phrase) + r'.*?$', + re.MULTILINE) except: import traceback traceback.print_exc()

1 0

[ibus-typing-booster] master: re.UNICODE is redundant in Python3, remove it (81fdef4)
by mfabian＠fedoraproject.org 29 Aug '16

29 Aug '16

1 0

[ibus-typing-booster] master: Add ibus-typing-booster.spec to .gitignore (346edd1)
by mfabian＠fedoraproject.org 29 Aug '16

29 Aug '16

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

ibus-typing-booster August 2016