August 2016 - tor-commits - lists.torproject.org

[nyx/master] Allow arguments in MenuItem constructor
by atagar＠torproject.org 27 Aug '16

27 Aug '16

commit 03aa68d2dd7622c55061a4df4caa390e41bc5d76 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Aug 24 08:26:28 2016 -0700 Allow arguments in MenuItem constructor We use partials quite a bit when constructing MenuItems. Better to just include this in the constructor. --- nyx/menu.py | 33 +++++++++++++++------------------ test/menu.py | 11 +++++++---- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/nyx/menu.py b/nyx/menu.py index 71dd738..7a42fd1 100644 --- a/nyx/menu.py +++ b/nyx/menu.py @@ -40,13 +40,16 @@ class MenuItem(object): :var Submenu submenu: top-level submenu we reside within """ - def __init__(self, label, callback): + def __init__(self, label, callback, *args): self.label = label self.suffix = '' - - self._callback = callback self._parent = None + if args: + self._callback = functools.partial(callback, *args) + else: + self._callback = callback + @property def prefix(self): return '' @@ -196,14 +199,13 @@ def make_actions_menu(): actions_menu = Submenu('Actions') actions_menu.add(MenuItem('Close Menu', None)) actions_menu.add(MenuItem('New Identity', header_panel.send_newnym)) - actions_menu.add(MenuItem('Reset Tor', functools.partial(controller.signal, stem.Signal.RELOAD))) + actions_menu.add(MenuItem('Reset Tor', controller.signal, stem.Signal.RELOAD)) if control.is_paused(): - label, arg = 'Unpause', False + actions_menu.add(MenuItem('Unpause', control.set_paused, False)) else: - label, arg = 'Pause', True + actions_menu.add(MenuItem('Pause', control.set_paused, True)) - actions_menu.add(MenuItem(label, functools.partial(control.set_paused, arg))) actions_menu.add(MenuItem('Exit', control.quit)) return actions_menu @@ -331,11 +333,9 @@ def make_log_menu(log_panel): log_menu.add(MenuItem('Clear', log_panel.clear)) if log_panel.is_duplicates_visible(): - label, arg = 'Hide', False + log_menu.add(MenuItem('Hide Duplicates', log_panel.set_duplicate_visability, False)) else: - label, arg = 'Show', True - - log_menu.add(MenuItem('%s Duplicates' % label, functools.partial(log_panel.set_duplicate_visability, arg))) + log_menu.add(MenuItem('Show Duplicates', log_panel.set_duplicate_visability, True)) # filter submenu @@ -418,17 +418,14 @@ def make_torrc_menu(torrc_panel): torrc_menu = Submenu('Torrc') if torrc_panel._show_comments: - label, arg = 'Hide', False + torrc_menu.add(MenuItem('Hide Comments', torrc_panel.set_comments_visible, False)) else: - label, arg = 'Show', True - - torrc_menu.add(MenuItem('%s Comments' % label, functools.partial(torrc_panel.set_comments_visible, arg))) + torrc_menu.add(MenuItem('Show Comments', torrc_panel.set_comments_visible, True)) if torrc_panel._show_line_numbers: - label, arg = 'Hide', False + torrc_menu.add(MenuItem('Hide Line Numbers', torrc_panel.set_line_number_visible, False)) else: - label, arg = 'Show', True - torrc_menu.add(MenuItem('%s Line Numbers' % label, functools.partial(torrc_panel.set_line_number_visible, arg))) + torrc_menu.add(MenuItem('Show Line Numbers', torrc_panel.set_line_number_visible, True)) return torrc_menu diff --git a/test/menu.py b/test/menu.py index fdf3352..2aa0e4b 100644 --- a/test/menu.py +++ b/test/menu.py @@ -11,11 +11,11 @@ class Container(object): value = False def __nonzero__(self): - return self.value + return bool(self.value) def action(*args): - IS_CALLED.value = True + IS_CALLED.value = args if args else True NO_OP = lambda: None @@ -40,11 +40,14 @@ class TestMenuItem(unittest.TestCase): def test_selection(self): menu_item = MenuItem('Test Item', action) - - self.assertFalse(IS_CALLED) menu_item.select() self.assertTrue(IS_CALLED) + def test_selection_with_value(self): + menu_item = MenuItem('Test Item', action, 'hi') + menu_item.select() + self.assertEqual(('hi',), IS_CALLED.value) + def test_menu_item_hierarchy(self): root_submenu = Submenu('Root Submenu') middle_submenu = Submenu('Middle Submenu')

1 0

[nyx/master] Unit tests for MenuCursor
by atagar＠torproject.org 27 Aug '16

27 Aug '16

commit 009f80a11f8d5fb2cf567bd7cd13834691abeb90 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Aug 26 10:09:50 2016 -0700 Unit tests for MenuCursor Adding tests for the MenuCursor class. It's a simple and easily testable one so simple to add good coverage. --- test/menu.py | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 97 insertions(+), 1 deletion(-) diff --git a/test/menu.py b/test/menu.py index a0772b2..162e08c 100644 --- a/test/menu.py +++ b/test/menu.py @@ -2,9 +2,12 @@ Unit tests for nyx.menu. """ +import curses import unittest -from nyx.menu import MenuItem, Submenu, RadioMenuItem, RadioGroup +import nyx.curses + +from nyx.menu import MenuItem, Submenu, RadioMenuItem, RadioGroup, MenuCursor class Container(object): @@ -21,9 +24,35 @@ def action(*args): IS_CALLED.value = args if args else True +def menu_cursor(*key_inputs): + cursor = MenuCursor(INITIAL_SELECTION) + + for key in key_inputs: + cursor.handle_key(nyx.curses.KeyInput(key)) + + return cursor + + NO_OP = lambda: None IS_CALLED = Container() +TEST_MENU = Submenu('Root Submenu', [ + Submenu('Submenu 1', [ + MenuItem('Item 1', action, 'selected 1'), + MenuItem('Item 2', action, 'selected 2'), + Submenu('Inner Submenu', [ + MenuItem('Item 3', action, 'selected 3'), + ]), + Submenu('Empty Submenu', []), + ]), + Submenu('Submenu 2', [ + MenuItem('Item 4', action, 'selected 1'), + MenuItem('Item 5', action, 'selected 2'), + ]) +]) + +INITIAL_SELECTION = TEST_MENU.children[0].children[0] + class TestMenuItem(unittest.TestCase): def setUp(self): @@ -147,3 +176,70 @@ class TestRadioMenuItem(unittest.TestCase): menu_item.select() self.assertFalse(IS_CALLED) + + +class TestMenuCursor(unittest.TestCase): + def setUp(self): + IS_CALLED.value = False + + def test_selection_of_item(self): + cursor = menu_cursor(curses.KEY_ENTER) + self.assertEqual(('selected 1',), IS_CALLED.value) + self.assertTrue(cursor.is_done) + + def test_selection_of_submenu(self): + cursor = menu_cursor(curses.KEY_DOWN, curses.KEY_DOWN, curses.KEY_ENTER) + self.assertEqual('Item 3', cursor.selection.label) + self.assertFalse(IS_CALLED.value) + self.assertFalse(cursor.is_done) + + def test_up(self): + cursor = menu_cursor() + + for expected in ('Item 1', 'Empty Submenu', 'Inner Submenu', 'Item 2', 'Item 1'): + self.assertEqual(expected, cursor.selection.label) + cursor.handle_key(nyx.curses.KeyInput(curses.KEY_UP)) + + def test_down(self): + cursor = menu_cursor() + + for expected in ('Item 1', 'Item 2', 'Inner Submenu', 'Empty Submenu', 'Item 1'): + self.assertEqual(expected, cursor.selection.label) + cursor.handle_key(nyx.curses.KeyInput(curses.KEY_DOWN)) + + def test_left(self): + cursor = menu_cursor() + + for expected in ('Item 1', 'Item 4', 'Item 1'): + self.assertEqual(expected, cursor.selection.label) + cursor.handle_key(nyx.curses.KeyInput(curses.KEY_LEFT)) + + def test_left_when_inner_submenu(self): + cursor = menu_cursor(curses.KEY_DOWN, curses.KEY_DOWN, curses.KEY_RIGHT) + + for expected in ('Item 3', 'Inner Submenu', 'Item 4'): + self.assertEqual(expected, cursor.selection.label) + cursor.handle_key(nyx.curses.KeyInput(curses.KEY_LEFT)) + + def test_right(self): + cursor = menu_cursor() + + for expected in ('Item 1', 'Item 4', 'Item 1'): + self.assertEqual(expected, cursor.selection.label) + cursor.handle_key(nyx.curses.KeyInput(curses.KEY_RIGHT)) + + def test_right_when_inner_submenu(self): + cursor = menu_cursor(curses.KEY_DOWN, curses.KEY_DOWN) + + for expected in ('Inner Submenu', 'Item 3', 'Item 4', 'Item 1'): + self.assertEqual(expected, cursor.selection.label) + cursor.handle_key(nyx.curses.KeyInput(curses.KEY_RIGHT)) + + def test_esc(self): + cursor = menu_cursor(27) + self.assertTrue(cursor.is_done) + + # pressing 'm' closes the menu too + + cursor = menu_cursor(ord('m')) + self.assertTrue(cursor.is_done)

1 0

[nyx/master] Rewrite menu rendering
by atagar＠torproject.org 27 Aug '16

27 Aug '16

commit 44ffc461ee718aaaa39e6d615681e7d73dd0f880 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Aug 27 11:11:48 2016 -0700 Rewrite menu rendering Definitely the thorniest part of the menu.py was its rendering logic. Lot of room for simplification now that we have our new curses rendering module. --- nyx/menu.py | 105 +++++++++++++++++++++++------------------------------------- 1 file changed, 40 insertions(+), 65 deletions(-) diff --git a/nyx/menu.py b/nyx/menu.py index 2ce4da6..8c60be9 100644 --- a/nyx/menu.py +++ b/nyx/menu.py @@ -200,7 +200,23 @@ class MenuCursor(object): self.is_done = True -def make_menu(): +def show_menu(): + menu = _make_menu() + cursor = MenuCursor(menu.children[0].children[0]) + + with nyx.curses.CURSES_LOCK: + nyx.controller.show_message('Press m or esc to close the menu.', BOLD) + + while not cursor.is_done: + selection_x = _draw_top_menubar(menu, cursor.selection) + _draw_submenu(cursor.selection, cursor.selection.submenu, 1, selection_x) + cursor.handle_key(nyx.curses.key_input()) + nyx.controller.get_controller().redraw() + + nyx.controller.show_message() + + +def _make_menu(): """ Constructs the base menu and all of its contents. """ @@ -269,84 +285,43 @@ def _view_menu(): return view_menu -def show_menu(): - selection_left = [0] - +def _draw_top_menubar(menu, selection): def _render(subwindow): x = 0 - for top_level_item in menu.children: - if top_level_item == cursor.selection.submenu: - selection_left[0] = x - attr = UNDERLINE - else: - attr = NORMAL - - x = subwindow.addstr(x, 0, ' %s ' % top_level_item.label, BOLD, attr) + for submenu in menu.children: + x = subwindow.addstr(x, 0, ' %s ' % submenu.label, BOLD, UNDERLINE if submenu == selection.submenu else NORMAL) subwindow.vline(x, 0, 1) x += 1 - with nyx.curses.CURSES_LOCK: - # generates the menu and uses the initial selection of the first item in - # the file menu - - menu = make_menu() - cursor = MenuCursor(menu.children[0].children[0]) + nyx.curses.draw(_render, height = 1, background = RED) - while not cursor.is_done: - # provide a message saying how to close the menu - - nyx.controller.show_message('Press m or esc to close the menu.', BOLD) - nyx.curses.draw(_render, height = 1, background = RED) - _draw_submenu(cursor, 1, 1, selection_left[0]) - cursor.handle_key(nyx.curses.key_input()) - - # redraws the rest of the interface if we're rendering on it again - - if not cursor.is_done: - nyx.controller.get_controller().redraw() - - nyx.controller.show_message() - - -def _draw_submenu(cursor, level, top, left): - selection_hierarchy = [cursor.selection] + selection_index = menu.children.index(selection.submenu) + return 3 * selection_index + sum([len(entry.label) for entry in menu.children[:selection_index]]) - while selection_hierarchy[-1].parent: - selection_hierarchy.append(selection_hierarchy[-1].parent) - selection_hierarchy.reverse() +def _draw_submenu(selection, submenu, top, left): + # find the item from within this submenu that's selected - # checks if there's nothing to display + submenu_selection = selection - if len(selection_hierarchy) < level + 2: - return + while submenu_selection.parent != submenu: + submenu_selection = submenu_selection.parent - # fetches the submenu and selection we're displaying + prefix_size = max([len(entry.prefix) for entry in submenu.children]) + middle_size = max([len(entry.label) for entry in submenu.children]) + suffix_size = max([len(entry.suffix) for entry in submenu.children]) - submenu = selection_hierarchy[level] - selection = selection_hierarchy[level + 1] - - # gets the size of the prefix, middle, and suffix columns - - all_label_sets = [(entry.prefix, entry.label, entry.suffix) for entry in submenu.children] - prefix_col_size = max([len(entry[0]) for entry in all_label_sets]) - middle_col_size = max([len(entry[1]) for entry in all_label_sets]) - suffix_col_size = max([len(entry[2]) for entry in all_label_sets]) - - # formatted string so we can display aligned menu entries - - label_format = ' %%-%is%%-%is%%-%is ' % (prefix_col_size, middle_col_size, suffix_col_size) - menu_width = len(label_format % ('', '', '')) - selection_top = submenu.children.index(selection) if selection in submenu.children else 0 + menu_width = prefix_size + middle_size + suffix_size + 2 + label_format = ' %%-%is%%-%is%%-%is ' % (prefix_size, middle_size, suffix_size) def _render(subwindow): for y, menu_item in enumerate(submenu.children): - if menu_item == selection: - subwindow.addstr(0, y, label_format % (menu_item.prefix, menu_item.label, menu_item.suffix), WHITE, BOLD) - else: - subwindow.addstr(0, y, label_format % (menu_item.prefix, menu_item.label, menu_item.suffix)) + label = label_format % (menu_item.prefix, menu_item.label, menu_item.suffix) + attr = (WHITE, BOLD) if menu_item == submenu_selection else (NORMAL,) + subwindow.addstr(0, y, label, *attr) - with nyx.curses.CURSES_LOCK: - nyx.curses.draw(_render, top = top, left = left, width = menu_width, height = len(submenu.children), background = RED) - _draw_submenu(cursor, level + 1, top + selection_top, left + menu_width) + nyx.curses.draw(_render, top = top, left = left, width = menu_width, height = len(submenu.children), background = RED) + + if submenu != selection.parent: + _draw_submenu(selection, submenu_selection, top + submenu.children.index(submenu_selection), left + menu_width)

1 0

[nyx/master] Use properties for MenuCursor
by atagar＠torproject.org 27 Aug '16

27 Aug '16

commit 616e3a8c62390000ad466642d7e2babebf503f20 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Aug 26 09:28:35 2016 -0700 Use properties for MenuCursor On reflection the MenuCursor is already pretty good. Replacing its accessor methods with attributes but otherwise leaving it alone. --- nyx/menu.py | 123 +++++++++++++++++++++++++++--------------------------------- 1 file changed, 55 insertions(+), 68 deletions(-) diff --git a/nyx/menu.py b/nyx/menu.py index ed58613..2ce4da6 100644 --- a/nyx/menu.py +++ b/nyx/menu.py @@ -150,6 +150,56 @@ class RadioGroup(object): self.selected_arg = selected_arg +class MenuCursor(object): + """ + Tracks selection and movement through the menu. + + :var MenuItem selection: presently selected menu item + :var bool is_done: **True** if a selection indicates we should close the + menu, **False** otherwise + """ + + def __init__(self, initial_selection): + self.selection = initial_selection + self.is_done = False + + def handle_key(self, key): + if key.is_selection(): + if isinstance(self.selection, Submenu): + if self.selection.children: + self.selection = self.selection.children[0] + else: + self.selection.select() + self.is_done = True + elif key.match('up'): + self.selection = self.selection.prev + elif key.match('down'): + self.selection = self.selection.next + elif key.match('left'): + if self.selection.parent == self.selection.submenu: + # shift to the previous main submenu + + prev_submenu = self.selection.submenu.prev + self.selection = prev_submenu.children[0] + else: + # go up a submenu level + + self.selection = self.selection.parent + elif key.match('right'): + if isinstance(self.selection, Submenu): + # open submenu (same as making a selection) + + if self.selection.children: + self.selection = self.selection.children[0] + else: + # shift to the next main submenu + + next_submenu = self.selection.submenu.next + self.selection = next_submenu.children[0] + elif key.match('esc', 'm'): + self.is_done = True + + def make_menu(): """ Constructs the base menu and all of its contents. @@ -190,7 +240,7 @@ def make_menu(): def _view_menu(): """ - View submenu consisting of... + Submenu consisting of... [X] <Page 1> [ ] <Page 2> @@ -219,69 +269,6 @@ def _view_menu(): return view_menu -class MenuCursor: - """ - Tracks selection and key handling in the menu. - """ - - def __init__(self, initial_selection): - self._selection = initial_selection - self._is_done = False - - def is_done(self): - """ - Provides true if a selection has indicated that we should close the menu. - False otherwise. - """ - - return self._is_done - - def get_selection(self): - """ - Provides the currently selected menu item. - """ - - return self._selection - - def handle_key(self, key): - is_selection_submenu = isinstance(self._selection, Submenu) - - if key.is_selection(): - if is_selection_submenu: - if self._selection.children: - self._selection = self._selection.children[0] - else: - self._selection.select() - self._is_done = True - elif key.match('up'): - self._selection = self._selection.prev - elif key.match('down'): - self._selection = self._selection.next - elif key.match('left'): - if self._selection.parent == self._selection.submenu: - # shift to the previous main submenu - - prev_submenu = self._selection.submenu.prev - self._selection = prev_submenu.children[0] - else: - # go up a submenu level - - self._selection = self._selection.parent - elif key.match('right'): - if is_selection_submenu: - # open submenu (same as making a selection) - - if self._selection.children: - self._selection = self._selection.children[0] - else: - # shift to the next main submenu - - next_submenu = self._selection.submenu.next - self._selection = next_submenu.children[0] - elif key.match('esc', 'm'): - self._is_done = True - - def show_menu(): selection_left = [0] @@ -289,7 +276,7 @@ def show_menu(): x = 0 for top_level_item in menu.children: - if top_level_item == cursor.get_selection().submenu: + if top_level_item == cursor.selection.submenu: selection_left[0] = x attr = UNDERLINE else: @@ -306,7 +293,7 @@ def show_menu(): menu = make_menu() cursor = MenuCursor(menu.children[0].children[0]) - while not cursor.is_done(): + while not cursor.is_done: # provide a message saying how to close the menu nyx.controller.show_message('Press m or esc to close the menu.', BOLD) @@ -316,14 +303,14 @@ def show_menu(): # redraws the rest of the interface if we're rendering on it again - if not cursor.is_done(): + if not cursor.is_done: nyx.controller.get_controller().redraw() nyx.controller.show_message() def _draw_submenu(cursor, level, top, left): - selection_hierarchy = [cursor.get_selection()] + selection_hierarchy = [cursor.selection] while selection_hierarchy[-1].parent: selection_hierarchy.append(selection_hierarchy[-1].parent)

1 0

[nyx/master] Rewrite and test menu
by atagar＠torproject.org 27 Aug '16

27 Aug '16

commit 290f1a98956c627c6c14c403f625d1a03e93742b Merge: 1d8714a 44ffc46 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Aug 27 11:13:28 2016 -0700 Rewrite and test menu So close, just the controller left to go! Rewriting and testing the menu module. This simplifies panels too by allowing them to construct their own submenus. nyx/controller.py | 7 +- nyx/menu.py | 723 +++++++++++++----------------------------------- nyx/panel/__init__.py | 11 + nyx/panel/config.py | 24 +- nyx/panel/connection.py | 24 +- nyx/panel/graph.py | 97 +++---- nyx/panel/log.py | 64 +++-- nyx/panel/torrc.py | 43 ++- test/__init__.py | 1 + test/menu.py | 245 ++++++++++++++++ 10 files changed, 600 insertions(+), 639 deletions(-)

1 0

[tor-messenger-build/master] Bump tags to THUNDERBIRD_45_3_0_RELEASE
by arlo＠torproject.org 27 Aug '16

27 Aug '16

commit 9da8647729c2b76ee35b2981fe2512ea1bd99309 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Aug 27 10:38:43 2016 -0700 Bump tags to THUNDERBIRD_45_3_0_RELEASE --- ChangeLog | 4 ++-- projects/instantbird/config | 2 +- projects/mozilla/config | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 497bb35..511334b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ Tor Messenger 0.1.0b7 -- * All Platforms - * Use the THUNDERBIRD_45_2_0_RELEASE tag on mozilla-esr45 - * Use the THUNDERBIRD_45_2_0_RELEASE tag on comm-esr45 + * Use the THUNDERBIRD_45_3_0_RELEASE tag on mozilla-esr45 + * Use the THUNDERBIRD_45_3_0_RELEASE tag on comm-esr45 * Bug 14388: Port Tor Browser's updater patches * Bug 19053: Display plaintext in notifications * Update libgcrypt to 1.6.6 for CVE-2016-6316 diff --git a/projects/instantbird/config b/projects/instantbird/config index c1d2b58..a1e2098 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' hg_url: https://hg.mozilla.org/releases/comm-esr45/ -hg_hash: THUNDERBIRD_45_2_0_RELEASE +hg_hash: THUNDERBIRD_45_3_0_RELEASE filename: "[% project %]-[% c('version') %]-[% c('var/osname') %]-[% c('var/build_id') %].[% c('var/archive_suffix') %]" remote_docker: 1 var: diff --git a/projects/mozilla/config b/projects/mozilla/config index c2b2e4d..2c14535 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' hg_url: https://hg.mozilla.org/releases/mozilla-esr45/ -hg_hash: THUNDERBIRD_45_2_0_RELEASE +hg_hash: THUNDERBIRD_45_3_0_RELEASE src: | #!/bin/sh set -e

1 0

[translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd
by translation＠torproject.org 27 Aug '16

27 Aug '16

commit 43afa8144420a9a92872d12ac5e9a53775b81edc Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 27 09:18:06 2016 +0000 Update translations for tor-messenger-prefsdtd --- ru/prefs.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ru/prefs.dtd b/ru/prefs.dtd index cccd4c5..183207b 100644 --- a/ru/prefs.dtd +++ b/ru/prefs.dtd @@ -16,7 +16,7 @@ <!ENTITY prefs.coniksConnection "Подключение"> <!ENTITY prefs.coniksServerAddress "Адрес сервера"> <!ENTITY prefs.coniksServerPort "Порт"> -<!ENTITY prefs.coniksAccountPolicy "Account Policy"> -<!ENTITY prefs.coniksPoliciesForAccount "Policies for account:"> +<!ENTITY prefs.coniksAccountPolicy "Политика учётной записи"> +<!ENTITY prefs.coniksPoliciesForAccount "Политики учётных записей:"> <!ENTITY prefs.coniksPrivateLookups "Private lookups"> <!ENTITY prefs.coniksSignedKeyChange "Signed key change"> \ No newline at end of file

1 0

[translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd
by translation＠torproject.org 27 Aug '16

27 Aug '16

commit a616c18566d8ef2d267d0d90377e1d55ef54165b Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 27 08:48:07 2016 +0000 Update translations for tor-messenger-prefsdtd --- ru/prefs.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ru/prefs.dtd b/ru/prefs.dtd index 63ff2ed..cccd4c5 100644 --- a/ru/prefs.dtd +++ b/ru/prefs.dtd @@ -13,9 +13,9 @@ <!ENTITY prefs.verifyNudge "Всегда проверяйте личность собеседника."> <!ENTITY prefs.emptyAccountList "Нет учётных записей"> <!ENTITY prefs.generate "Сгенерировать"> -<!ENTITY prefs.coniksConnection "Connection"> -<!ENTITY prefs.coniksServerAddress "Server Address"> -<!ENTITY prefs.coniksServerPort "Port"> +<!ENTITY prefs.coniksConnection "Подключение"> +<!ENTITY prefs.coniksServerAddress "Адрес сервера"> +<!ENTITY prefs.coniksServerPort "Порт"> <!ENTITY prefs.coniksAccountPolicy "Account Policy"> <!ENTITY prefs.coniksPoliciesForAccount "Policies for account:"> <!ENTITY prefs.coniksPrivateLookups "Private lookups">

1 0

[tor-messenger-build/master] Fix typo in preferences.patch
by sukhbir＠torproject.org 27 Aug '16

27 Aug '16

commit 0b77aee0b537ab25edb585e1699fd14bc4b5d18f Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Aug 26 23:15:38 2016 -0400 Fix typo in preferences.patch --- projects/instantbird/preferences.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/instantbird/preferences.patch b/projects/instantbird/preferences.patch index 55d1439..b9599eb 100644 --- a/projects/instantbird/preferences.patch +++ b/projects/instantbird/preferences.patch @@ -50,7 +50,7 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. // URL user can browse to manually if for some reason all update installation // attempts fail. -pref("app.update.url.manual", "http://www.instantbird.com/download.html"); -+pref("app.update.url.manual", "https://www.torproject.org) ++pref("app.update.url.manual", "https://www.torproject.org"); // A default value for the "More information about this update" link // supplied in the "An update is available" page of the update wizard.

1 0

[tor-messenger-build/master] Remove links from the updater window
by sukhbir＠torproject.org 27 Aug '16

27 Aug '16

commit c1a11869d136155dc74a709c34d733cdd610ad97 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Aug 26 21:59:23 2016 -0400 Remove links from the updater window --- projects/instantbird/config | 1 + projects/instantbird/updater-remove-links.mozpatch | 37 ++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index 7e3bf13..c1d2b58 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -135,6 +135,7 @@ input_files: - filename: Updater-Linux-search-path-bug-18900.mozpatch - filename: aboutTBUpdateLogo.png - filename: trac-16475.mozpatch + - filename: updater-remove-links.mozpatch - filename: OSX-package-as-tar.bz2.mozpatch enable: '[% c("var/osx") %]' - filename: browserMountPoints.inc diff --git a/projects/instantbird/updater-remove-links.mozpatch b/projects/instantbird/updater-remove-links.mozpatch new file mode 100644 index 0000000..865423e --- /dev/null +++ b/projects/instantbird/updater-remove-links.mozpatch @@ -0,0 +1,37 @@ +diff --git a/toolkit/locales/en-US/chrome/mozapps/update/updates.dtd b/toolkit/locales/en-US/chrome/mozapps/update/updates.dtd +--- a/toolkit/locales/en-US/chrome/mozapps/update/updates.dtd ++++ b/toolkit/locales/en-US/chrome/mozapps/update/updates.dtd +@@ -34,7 +34,7 @@ + <!ENTITY incompatibleCheck.title "Checking Add-on Compatibility"> + <!ENTITY incompatibleCheck.label "Looking for newer versions of your add-ons…"> + +-<!ENTITY clickHere.label "View more information about this update"> ++<!ENTITY clickHere.label "View more information about this update:"> + + <!ENTITY evangelism.desc "It is strongly recommended that you apply this + update for &brandShortName; as soon as possible."> +diff --git a/toolkit/mozapps/update/content/updates.js b/toolkit/mozapps/update/content/updates.js +--- a/toolkit/mozapps/update/content/updates.js ++++ b/toolkit/mozapps/update/content/updates.js +@@ -952,7 +952,7 @@ + + var updateMoreInfoURL = document.getElementById("updateMoreInfoURL"); + if (update.detailsURL) +- updateMoreInfoURL.setAttribute("url", update.detailsURL); ++ updateMoreInfoURL.setAttribute("value", update.detailsURL); + else + updateMoreInfoURL.hidden = true; + +diff --git a/toolkit/mozapps/update/content/updates.xul b/toolkit/mozapps/update/content/updates.xul +--- a/toolkit/mozapps/update/content/updates.xul ++++ b/toolkit/mozapps/update/content/updates.xul +@@ -121,8 +121,7 @@ + <separator id="upgradeEvangelismSep" flex="1"/> + <vbox flex="1"> + <hbox id="moreInfoURL"> +- <label class="text-link" id="updateMoreInfoURL" +- value="&clickHere.label;" onclick="openUpdateURL(event);"/> ++ <textbox class="plain" flex="1" readonly="true" id="updateMoreInfoURL" /> + </hbox> + </vbox> + </vbox>

1 0