diff options
| -rwxr-xr-x | misc/genFAQ.py | 14 | ||||
| -rw-r--r-- | src/de/blinkt/openvpn/core/VpnStatus.java | 6 |
2 files changed, 20 insertions, 0 deletions
diff --git a/misc/genFAQ.py b/misc/genFAQ.py index ccd3e589..713d71f1 100755 --- a/misc/genFAQ.py +++ b/misc/genFAQ.py @@ -99,6 +99,20 @@ def main(): faq= genPage(faqdom,lang) open("%s/FAQ.wiki" % langdir,"w").write(faq.encode("utf-8")) + checkFormatString(lang) +def checkFormatString(lang): + for strid in strres["default"]: + ostr = getString(strid,"default") + tstr = getString(strid,lang) + + + for f in ["%s", "%d", "%f"] + ["%%%d$s" % d for d in range(0,10)] + ["%%%d$d" % d for d in range(0,10)]: + ino = ostr.find(f)==-1 + int = tstr.find(f)==-1 + + if ino != int: + print "Mismatch",strid,f,ostr,tstr + if __name__=="__main__": main() diff --git a/src/de/blinkt/openvpn/core/VpnStatus.java b/src/de/blinkt/openvpn/core/VpnStatus.java index 86f0f727..60fa730e 100644 --- a/src/de/blinkt/openvpn/core/VpnStatus.java +++ b/src/de/blinkt/openvpn/core/VpnStatus.java @@ -18,6 +18,7 @@ import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; import java.util.Arrays; +import java.util.FormatFlagsConversionMismatchException; import java.util.LinkedList; import java.util.Locale; import java.util.UnknownFormatConversionException; @@ -168,6 +169,11 @@ public class VpnStatus { throw new UnknownFormatConversionException(e.getLocalizedMessage() + getString(null)); else throw e; + } catch (java.util.FormatFlagsConversionMismatchException e) { + if (c != null) + throw new FormatFlagsConversionMismatchException(e.getLocalizedMessage() + getString(null),e.getConversion()); + else + throw e; } } |