Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions App.Library/ViewModels/MainViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -464,19 +464,20 @@ public void Connect(EapConfig eapConfig)

switch (connector)
{
case CredentialsConnector credentialsConnector:
this.SetActiveContent(new ConnectWithCredentialsViewModel(this, eapConfig, credentialsConnector));
break;
case CertPassConnector certPassConnector:
this.SetActiveContent(new ConnectWithCertificatePassphraseViewModel(this, eapConfig, certPassConnector));
break;
case CertAndCertPassConnector certAndCertPassConnector:
this.SetActiveContent(new ConnectWithLocalCertificatePassphraseViewModel(this, eapConfig, certAndCertPassConnector));
break;
case DefaultConnector defaultConnector:
this.SetActiveContent(new ConnectViewModel(this, eapConfig, defaultConnector));
break;
//case CredentialsConnector credentialsConnector:
// this.SetActiveContent(new ConnectWithCredentialsViewModel(this, eapConfig, credentialsConnector));
// break;
//case CertPassConnector certPassConnector:
// this.SetActiveContent(new ConnectWithCertificatePassphraseViewModel(this, eapConfig, certPassConnector));
// break;
//case CertAndCertPassConnector certAndCertPassConnector:
// this.SetActiveContent(new ConnectWithLocalCertificatePassphraseViewModel(this, eapConfig, certAndCertPassConnector));
// break;
//case DefaultConnector defaultConnector:
// this.SetActiveContent(new ConnectViewModel(this, eapConfig, defaultConnector));
// break;
default:
MessageBox.Show(string.Format(EduRoam.Localization.Resources.ErrorUnsupportedConnectionType, connector?.GetType().Name), $"{Settings.Settings.ApplicationName} - Exception", MessageBoxButton.OK, MessageBoxImage.Error);
throw new NotSupportedException(string.Format(EduRoam.Localization.Resources.ErrorUnsupportedConnectionType, connector?.GetType().Name));

}
Expand Down
44 changes: 23 additions & 21 deletions EduRoam.Localization/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 21 additions & 19 deletions EduRoam.Localization/Resources.nl.resx
Original file line number Diff line number Diff line change
Expand Up @@ -59,46 +59,46 @@
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0"/>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string"/>
<xsd:attribute name="type" type="xsd:string"/>
<xsd:attribute name="mimetype" type="xsd:string"/>
<xsd:attribute ref="xml:space"/>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string"/>
<xsd:attribute name="name" type="xsd:string"/>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
<xsd:attribute ref="xml:space"/>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required"/>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
Expand Down Expand Up @@ -350,7 +350,9 @@ Uitzondering: {0}.</value>
<value>Onbekend profiel, probeer authenticatie proces opnieuw.</value>
</data>
<data name="ErrorUnsupportedConnectionType" xml:space="preserve">
<value>Verbinding van type {0} wordt (nog) niet ondersteund.</value>
<value>EAP Configuratie fout:

Verbinding van type {0} wordt niet ondersteund.</value>
</data>
<data name="ErrorUnsupportedInstituteOrProfile" xml:space="preserve">
<value>De organisatie of het profiel wordt niet ondersteund of is verkeerd ingedeeld.
Expand Down Expand Up @@ -691,4 +693,4 @@ Foutmelding: {0}</value>
<data name="CopyLinkButton" xml:space="preserve">
<value>Kopiëer link</value>
</data>
</root>
</root>
4 changes: 3 additions & 1 deletion EduRoam.Localization/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,9 @@ Exception: {0}.</value>
<value>Unknown profile, retry authentication process</value>
</data>
<data name="ErrorUnsupportedConnectionType" xml:space="preserve">
<value>Connection of type {0} is not supported (yet).</value>
<value>EAP Configuration error:

Connection of type {0} is not supported.</value>
</data>
<data name="ErrorUnsupportedInstituteOrProfile" xml:space="preserve">
<value>The organisation or profile is either not supported or malformed.
Expand Down