Skip to content

Commit 16abb06

Browse files
authored
Update ssl certificate errors handling (#299)
* close #266
1 parent 27c1f8b commit 16abb06

6 files changed

Lines changed: 209 additions & 169 deletions

File tree

i18n/isogeo_search_engine_en.ts

Lines changed: 50 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<context>
44
<name>ApiRequester</name>
55
<message>
6-
<location filename="../modules/api/request.py" line="467"/>
6+
<location filename="../modules/api/request.py" line="487"/>
77
<source>Dataset</source>
88
<translation type="unfinished"></translation>
99
</message>
@@ -300,47 +300,47 @@ You have a proxy set up on your OS {} but none in QGIS.
300300
<context>
301301
<name>LayerAdder</name>
302302
<message>
303-
<location filename="../modules/layer/add_layer.py" line="984"/>
303+
<location filename="../modules/layer/add_layer.py" line="986"/>
304304
<source>Error</source>
305305
<translation type="unfinished"></translation>
306306
</message>
307307
<message>
308-
<location filename="../modules/layer/add_layer.py" line="738"/>
308+
<location filename="../modules/layer/add_layer.py" line="740"/>
309309
<source>Vector not valid {}. QGIS says: {}</source>
310310
<translation type="unfinished"></translation>
311311
</message>
312312
<message>
313-
<location filename="../modules/layer/add_layer.py" line="778"/>
313+
<location filename="../modules/layer/add_layer.py" line="780"/>
314314
<source>Raster not valid {}. QGIS says: {}</source>
315315
<translation type="unfinished"></translation>
316316
</message>
317317
<message>
318-
<location filename="../modules/layer/add_layer.py" line="801"/>
318+
<location filename="../modules/layer/add_layer.py" line="803"/>
319319
<source>EFS not valid. QGIS says: {}</source>
320320
<translation type="unfinished"></translation>
321321
</message>
322322
<message>
323-
<location filename="../modules/layer/add_layer.py" line="823"/>
323+
<location filename="../modules/layer/add_layer.py" line="825"/>
324324
<source>EMS not valid. QGIS says: {}</source>
325325
<translation type="unfinished"></translation>
326326
</message>
327327
<message>
328-
<location filename="../modules/layer/add_layer.py" line="856"/>
328+
<location filename="../modules/layer/add_layer.py" line="858"/>
329329
<source>WFS is not valid. QGIS says: {}</source>
330330
<translation type="unfinished"></translation>
331331
</message>
332332
<message>
333-
<location filename="../modules/layer/add_layer.py" line="891"/>
333+
<location filename="../modules/layer/add_layer.py" line="893"/>
334334
<source>WMS is not valid. QGIS says: {}</source>
335335
<translation type="unfinished"></translation>
336336
</message>
337337
<message>
338-
<location filename="../modules/layer/add_layer.py" line="912"/>
338+
<location filename="../modules/layer/add_layer.py" line="914"/>
339339
<source>WMTS is not valid. QGIS says: {}</source>
340340
<translation type="unfinished"></translation>
341341
</message>
342342
<message>
343-
<location filename="../modules/layer/add_layer.py" line="984"/>
343+
<location filename="../modules/layer/add_layer.py" line="986"/>
344344
<source>The PostGIS layer is not valid. Reason: {}</source>
345345
<translation type="unfinished"></translation>
346346
</message>
@@ -555,22 +555,17 @@ You have a proxy set up on your OS {} but none in QGIS.
555555
<translation type="unfinished"></translation>
556556
</message>
557557
<message>
558-
<location filename="../modules/user_inform.py" line="107"/>
559-
<source>The script is looping. Make sure you shared a catalog with the plugin.If this error keeps happening, please report it in the bug tracker.</source>
560-
<translation type="unfinished"></translation>
561-
</message>
562-
<message>
563-
<location filename="../modules/user_inform.py" line="112"/>
558+
<location filename="../modules/user_inform.py" line="113"/>
564559
<source>Request to Isogeo&apos;s API failed : unkown error found. Please, report it in the bug tracker.</source>
565560
<translation type="unfinished"></translation>
566561
</message>
567562
<message>
568-
<location filename="../modules/user_inform.py" line="117"/>
563+
<location filename="../modules/user_inform.py" line="118"/>
569564
<source>API authentication failed : unexpected API&apos;s reply. Please, report it in the bug tracker.</source>
570565
<translation type="unfinished"></translation>
571566
</message>
572567
<message>
573-
<location filename="../modules/user_inform.py" line="122"/>
568+
<location filename="../modules/user_inform.py" line="123"/>
574569
<source>Request to Isogeo&apos;s API failed : please check your Internet connection and your proxy configuration. If this error keeps happening, please report it in the bug tracker.</source>
575570
<translation type="unfinished"></translation>
576571
</message>
@@ -580,10 +575,15 @@ You have a proxy set up on your OS {} but none in QGIS.
580575
<translation type="unfinished"></translation>
581576
</message>
582577
<message>
583-
<location filename="../modules/user_inform.py" line="143"/>
578+
<location filename="../modules/user_inform.py" line="144"/>
584579
<source>No share feeds the plugin. If you want to access resources via the plugin, you must share at least one catalog containing at least one metadata with it.</source>
585580
<translation type="unfinished"></translation>
586581
</message>
582+
<message>
583+
<location filename="../modules/user_inform.py" line="107"/>
584+
<source>The script is looping. Make sure you shared a catalog with the plugin and check your Internet connection. If this error keeps happening, please report it in the bug tracker.</source>
585+
<translation type="unfinished"></translation>
586+
</message>
587587
</context>
588588
<context>
589589
<name>dlg_credits</name>
@@ -621,45 +621,35 @@ You have a proxy set up on your OS {} but none in QGIS.
621621
<context>
622622
<name>dlg_form_auth_prompt</name>
623623
<message>
624-
<location filename="../ui/auth/ui_authentication.py" line="357"/>
624+
<location filename="../ui/auth/ui_authentication.py" line="267"/>
625625
<source>Isogeo authentication settings</source>
626626
<translation type="unfinished"></translation>
627627
</message>
628628
<message>
629-
<location filename="../ui/auth/ui_authentication.py" line="406"/>
629+
<location filename="../ui/auth/ui_authentication.py" line="280"/>
630630
<source>Request plugin access</source>
631631
<translation type="unfinished"></translation>
632632
</message>
633633
<message>
634-
<location filename="../ui/auth/ui_authentication.py" line="383"/>
634+
<location filename="../ui/auth/ui_authentication.py" line="274"/>
635635
<source>Application ID:</source>
636636
<translation type="unfinished"></translation>
637637
</message>
638638
<message>
639-
<location filename="../ui/auth/ui_authentication.py" line="366"/>
639+
<location filename="../ui/auth/ui_authentication.py" line="270"/>
640640
<source>Application SECRET:</source>
641641
<translation type="unfinished"></translation>
642642
</message>
643643
<message>
644-
<location filename="../ui/auth/ui_authentication.py" line="403"/>
644+
<location filename="../ui/auth/ui_authentication.py" line="279"/>
645645
<source>Don&apos;t have an account yet ?</source>
646646
<translation type="unfinished"></translation>
647647
</message>
648648
<message>
649-
<location filename="../ui/auth/ui_authentication.ui" line="64"/>
649+
<location filename="../ui/auth/ui_authentication.py" line="268"/>
650650
<source>I already have Isogeo ID and SECRET for this application</source>
651651
<translation type="unfinished"></translation>
652652
</message>
653-
<message>
654-
<location filename="../ui/auth/ui_authentication.py" line="384"/>
655-
<source>Check access validity</source>
656-
<translation type="unfinished"></translation>
657-
</message>
658-
<message>
659-
<location filename="../ui/auth/ui_authentication.py" line="387"/>
660-
<source>Check</source>
661-
<translation type="unfinished"></translation>
662-
</message>
663653
<message>
664654
<location filename="../ui/auth/ui_authentication.ui" line="598"/>
665655
<source>&lt;!DOCTYPE html&gt;
@@ -678,45 +668,62 @@ You have a proxy set up on your OS {} but none in QGIS.
678668
<translation type="unfinished"></translation>
679669
</message>
680670
<message>
681-
<location filename="../ui/auth/ui_authentication.py" line="369"/>
671+
<location filename="../ui/auth/ui_authentication.py" line="271"/>
682672
<source>I&apos;ve got the power hey yeah heh!</source>
683673
<translation type="unfinished"></translation>
684674
</message>
685675
<message>
686-
<location filename="../ui/auth/ui_authentication.py" line="372"/>
676+
<location filename="../ui/auth/ui_authentication.py" line="272"/>
687677
<source>I&apos;ve got edition rights on app.isogeo.com</source>
688678
<translation type="unfinished"></translation>
689679
</message>
690680
<message>
691-
<location filename="../ui/auth/ui_authentication.py" line="388"/>
681+
<location filename="../ui/auth/ui_authentication.py" line="273"/>
692682
<source>From a file:</source>
693683
<translation type="unfinished"></translation>
694684
</message>
695685
<message>
696-
<location filename="../ui/auth/ui_authentication.ui" line="128"/>
686+
<location filename="../ui/auth/ui_authentication.py" line="269"/>
697687
<source>plugin-qgis-org-a1b23c4d5f6g7h8i9j10kl11mn13op14</source>
698688
<translation type="unfinished"></translation>
699689
</message>
700690
<message>
701-
<location filename="../ui/auth/ui_authentication.py" line="391"/>
691+
<location filename="../ui/auth/ui_authentication.py" line="277"/>
702692
<source>Pick your credentials file</source>
703693
<translation type="unfinished"></translation>
704694
</message>
705695
<message>
706-
<location filename="../ui/auth/ui_authentication.py" line="394"/>
696+
<location filename="../ui/auth/ui_authentication.py" line="278"/>
707697
<source>Locate the Isogeo API credentials file</source>
708698
<translation type="unfinished"></translation>
709699
</message>
710700
<message>
711-
<location filename="../ui/auth/ui_authentication.py" line="397"/>
701+
<location filename="../ui/auth/ui_authentication.py" line="275"/>
712702
<source>Only for information, the Isogeo API base URL</source>
713703
<translation type="unfinished"></translation>
714704
</message>
715705
<message>
716-
<location filename="../ui/auth/ui_authentication.py" line="402"/>
706+
<location filename="../ui/auth/ui_authentication.py" line="276"/>
717707
<source>API location:</source>
718708
<translation type="unfinished"></translation>
719709
</message>
710+
<message>
711+
<location filename="../ui/auth/ui_authentication.py" line="281"/>
712+
<source>&lt;!DOCTYPE html&gt;
713+
&lt;html&gt;
714+
&lt;body&gt;
715+
716+
&lt;ul&gt;
717+
&lt;li&gt;Completely free to access generic Open Data&lt;/li&gt;
718+
&lt;li&gt;Completely free to work with 20 of your geographic data and services (Isogeo account required)&lt;/li&gt;
719+
&lt;li&gt;Ask for our annual plans to work with your whole geographic data and services !&lt;/li&gt;
720+
&lt;/ul&gt;
721+
722+
&lt;/body&gt;
723+
&lt;/html&gt;
724+
</source>
725+
<translation type="unfinished"></translation>
726+
</message>
720727
</context>
721728
<context>
722729
<name>dlg_metadata_details</name>

i18n/isogeo_search_engine_fr.qm

1.01 KB
Binary file not shown.

0 commit comments

Comments
 (0)