Tkabber

Check-in [05ccd5dc66]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Improved the fetch key information dialog. Updated Russain and Ukrainian translations.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 05ccd5dc6651576c6d0e4719603fbd274350fd99
User & Date: sgolovan 2016-01-04 19:54:27
Context
2016-01-06
13:41
Use 'from' attribute when opening XMPP streams. check-in: ed33c3cdb4 user: sgolovan tags: trunk
2016-01-04
19:54
Improved the fetch key information dialog. Updated Russain and Ukrainian translations. check-in: 05ccd5dc66 user: sgolovan tags: trunk
2016-01-03
17:13
Fixed simultaneous encrypting and signing. Moved drawing of GPG icons for outgoing messages from rewrite_outgoing_message_hook to draw_message_hook. Translate the 'This message is encrypted.' auxiliary message to the recipient language instead of our own. Moved the 'This message is encrypted.' message translation to the trans/ subdirectory. check-in: 0cc718bae7 user: sgolovan tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to ChangeLog.







1
2
3
4
5
6
7






2016-01-03  Sergei Golovan  <sgolovan@nes.ru>

	* plugins/general/gpgme.tcl: Fixed simultaneous encrypting and signing.
	  Moved drawing of GPG icons for outgoing messages from
	  rewrite_outgoing_message_hook to draw_message_hook. Translate the
	  'This message is encrypted.' auxiliary message to the recipient
	  language instead of our own.
>
>
>
>
>
>







1
2
3
4
5
6
7
8
9
10
11
12
13
2016-01-04  Sergei Golovan  <sgolovan@nes.ru>

	* plugins/general/gpgme.tcl: Improved the fetch key information dialog.

	* msgs/ru.msg, msgs/uk.msg: Updated Russain and Ukrainian translations.

2016-01-03  Sergei Golovan  <sgolovan@nes.ru>

	* plugins/general/gpgme.tcl: Fixed simultaneous encrypting and signing.
	  Moved drawing of GPG icons for outgoing messages from
	  rewrite_outgoing_message_hook to draw_message_hook. Translate the
	  'This message is encrypted.' auxiliary message to the recipient
	  language instead of our own.

Changes to msgs/ru.msg.

2485
2486
2487
2488
2489
2490
2491







2492
2493
2494
2495
2496
2497
2498
        logs!\n\nI refuse to convert logs database." "Вы храните журналы\
        разговоров Tkabber'а в корневой директории %s!\n\nКонвертирование\
        журналов отменяется."
::msgcat::mcset ru "Your new Tkabber config directory is now:\n%s\nYou can\
        delete the old one:\n%s" "Новая директория с настройками\
        Tkabber'а:\n%s\nВы можете удалить старую:\n%s"
::msgcat::mcset ru "Zip" "Индекс"








::msgcat::mcset ru "\n\tJID: %s"
::msgcat::mcset ru "auto-away"
::msgcat::mcset ru "BBS:"
::msgcat::mcset ru "bwidget workarounds"
::msgcat::mcset ru "day"
::msgcat::mcset ru "days"







>
>
>
>
>
>
>







2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
        logs!\n\nI refuse to convert logs database." "Вы храните журналы\
        разговоров Tkabber'а в корневой директории %s!\n\nКонвертирование\
        журналов отменяется."
::msgcat::mcset ru "Your new Tkabber config directory is now:\n%s\nYou can\
        delete the old one:\n%s" "Новая директория с настройками\
        Tkabber'а:\n%s\nВы можете удалить старую:\n%s"
::msgcat::mcset ru "Zip" "Индекс"
::msgcat::mcset ru "not actually changed" "не изменился"
::msgcat::mcset ru "entirely new key" "совершенно новый ключ"
::msgcat::mcset ru "new user IDs" "новые ID пользователя"
::msgcat::mcset ru "new signatures" "новые подписи"
::msgcat::mcset ru "new subkeys" "новые подключи"
::msgcat::mcset ru "contains private key" "содержит закрытый ключ"


::msgcat::mcset ru "\n\tJID: %s"
::msgcat::mcset ru "auto-away"
::msgcat::mcset ru "BBS:"
::msgcat::mcset ru "bwidget workarounds"
::msgcat::mcset ru "day"
::msgcat::mcset ru "days"

Changes to msgs/uk.msg.

2674
2675
2676
2677
2678
2679
2680








2681
2682
2683
2684
2685
2686
2687
# ./proxy.tcl
::msgcat::mcset uk "Currently active profile" "Поточний діючий профіль"
::msgcat::mcset uk "Default empty profile" "Порожній профіль за\
        замовчуванням"
::msgcat::mcset uk "Profile from config file" "Профіль з конфігураційного\
        файлу"









#==================================================================

namespace eval :: {
proc load_ukrainian_procs {} {
    rename format_time ""
    rename uk_format_time format_time
}







>
>
>
>
>
>
>
>







2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
# ./proxy.tcl
::msgcat::mcset uk "Currently active profile" "Поточний діючий профіль"
::msgcat::mcset uk "Default empty profile" "Порожній профіль за\
        замовчуванням"
::msgcat::mcset uk "Profile from config file" "Профіль з конфігураційного\
        файлу"

# ./plugins/general/gpgme.tcl
::msgcat::mcset uk "not actually changed" "не змінився"
::msgcat::mcset uk "entirely new key" "зовсім новий ключ"
::msgcat::mcset uk "new user IDs" "нові ID користувача"
::msgcat::mcset uk "new signatures" "нові підписи"
::msgcat::mcset uk "new subkeys" "нові підключі"
::msgcat::mcset uk "contains private key" "містить закритий ключ"

#==================================================================

namespace eval :: {
proc load_ukrainian_procs {} {
    rename format_time ""
    rename uk_format_time format_time
}

Changes to plugins/general/gpgme.tcl.

165
166
167
168
169
170
171








172
173
174
175
176
177
178
                diff       [::msgcat::mc "Multiple signatures having different\
                                          authenticity"] \
                expired    [::msgcat::mc "The signature is good but has\
                                          expired"] \
                expiredkey [::msgcat::mc "The signature is good but the key\
                                          has expired"]]









    catch {unset warnings}
    array set warnings {}

    variable signedid 0
}









>
>
>
>
>
>
>
>







165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
                diff       [::msgcat::mc "Multiple signatures having different\
                                          authenticity"] \
                expired    [::msgcat::mc "The signature is good but has\
                                          expired"] \
                expiredkey [::msgcat::mc "The signature is good but the key\
                                          has expired"]]

    array set f2s \
          [list unchanged       [::msgcat::mc "not actually changed"] \
                new_key         [::msgcat::mc "entirely new key"] \
                new_uids        [::msgcat::mc "new user IDs"] \
                new_sigs        [::msgcat::mc "new signatures"] \
                new_subkeys     [::msgcat::mc "new subkeys"] \
                new_private_key [::msgcat::mc "contains private key"]]

    catch {unset warnings}
    array set warnings {}

    variable signedid 0
}


769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794

795
796
797
798
799
800
801
802





803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
}

proc ::ssj::processFetchkeys {xlib status output} {
    variable ctx
    variable gpg_error_id

    if {$status ne "ok"} {
        incr gpg_error_id
        NonmodalMessageDlg .keyfetch_error$gpg_error_id \
            -aspect 50000 -icon error \
            -message "Key fetch error\n\n$output"
    } else {
        # In case of success let's update the affected keys info

        set patterns {}
        foreach {fp status} $output {
            lappend patterns $fp
        }
        $ctx($xlib) list-keys -patterns $patterns \
                -command [list ::ssj::reportFetchkeys $xlib $output]
    }
}

proc ::ssj::reportFetchkeys {xlib output status keys} {
    variable ctx
    variable gpg_error_id


    set text ""
    foreach {fp info} $output {
        unset -nocomplain status
        array set status $info
        if {$status(status) ne "ok"} {
            append text "\n0x[string range $fp end-7 end]: $status(reason)"
        } else {





            if {[catch {$ctx($xlib) info-key -key $fp} keyinfo]} {
                append text "\n0x[string range $fp end-7 end]: $status(flags)"
            } else {
                set uids ""
                foreach {k v} $keyinfo {
                    if {$k eq "userid"} {
                        append uids "\n    $v"
                    }
                }
                append text "\n0x[string range $fp end-7 end]$uids: $status(flags)"
            }
        }
    }

    incr gpg_error_id
    NonmodalMessageDlg .keyfetch_ok$gpg_error_id \
            -aspect 50000 -icon info \
            -message "Key fetch result\n$text"
}

###############################################################################

proc ::ssj::rewrite_message_body \







<
|

















>








>
>
>
>
>

|







|




<
|







777
778
779
780
781
782
783

784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829

830
831
832
833
834
835
836
837
}

proc ::ssj::processFetchkeys {xlib status output} {
    variable ctx
    variable gpg_error_id

    if {$status ne "ok"} {

        NonmodalMessageDlg .keyfetch_error[incr gpg_error_id] \
            -aspect 50000 -icon error \
            -message "Key fetch error\n\n$output"
    } else {
        # In case of success let's update the affected keys info

        set patterns {}
        foreach {fp status} $output {
            lappend patterns $fp
        }
        $ctx($xlib) list-keys -patterns $patterns \
                -command [list ::ssj::reportFetchkeys $xlib $output]
    }
}

proc ::ssj::reportFetchkeys {xlib output status keys} {
    variable ctx
    variable gpg_error_id
    variable f2s

    set text ""
    foreach {fp info} $output {
        unset -nocomplain status
        array set status $info
        if {$status(status) ne "ok"} {
            append text "\n0x[string range $fp end-7 end]: $status(reason)"
        } else {
            set flags {}
            foreach f $status(flags) {
                lappend flags $f2s($f)
            }
            set tflags [join $flags ",\n\t"]
            if {[catch {$ctx($xlib) info-key -key $fp} keyinfo]} {
                append text "\n0x[string range $fp end-7 end]:\n\t$tflags"
            } else {
                set uids ""
                foreach {k v} $keyinfo {
                    if {$k eq "userid"} {
                        append uids "\n    $v"
                    }
                }
                append text "\n0x[string range $fp end-7 end]$uids:\n\t$tflags"
            }
        }
    }


    NonmodalMessageDlg .keyfetch_ok[incr gpg_error_id] \
            -aspect 50000 -icon info \
            -message "Key fetch result\n$text"
}

###############################################################################

proc ::ssj::rewrite_message_body \