1273 Commits

Author SHA1 Message Date
Franco Fichtner
ec9fdf7862 rc: gettext() foo 2015-05-11 09:07:27 +02:00
Franco Fichtner
c8d185a443 inc: minimise line movement on previous 2015-05-11 08:58:43 +02:00
Franco Fichtner
0b3c3aacb9 inc: gettext() as usual 2015-05-11 08:57:20 +02:00
Franco Fichtner
b9fab880db inc: missing one 2015-05-11 08:53:53 +02:00
Franco Fichtner
aac05b7e99 inc: gettext() woes 2015-05-11 08:52:04 +02:00
Franco Fichtner
d941a2eba9 inc: more gettext() weirdness 2015-05-11 08:41:24 +02:00
Franco Fichtner
321d458ea0 inc: gettext() hiccup found via xgettext 2015-05-11 08:33:51 +02:00
Franco Fichtner
77c4d92937 make: wipe file before regeneration 2015-05-11 08:20:50 +02:00
Franco Fichtner
a879f1dc8e Merge pull request #171 from dotike/locale.EN.canonical-Xcatch-upstream
Locale.en.canonical xcatch upstream
2015-05-11 08:14:51 +02:00
Isaac (.ike) Levy
41ba7900f5 -j "join messages with existing file"
I believe this is what we want long term, to ensure translation messages don't pile up, and that they retain multiple comment lines for source references, etc... Please tell me if I'm wrong, I'm not 100% on how it's behaviour works.

Signed-off-by: Isaac (.ike) Levy <ike@blackskyresearch.net>
2015-05-11 02:01:08 -04:00
Isaac (.ike) Levy
5a4ceb31cf xgettext(1) generated, closer to Franco's spec
# for i in `git grep --name-only gettext | grep -v pot$` ; do
  #   xgettext -j -F -L PHP --from-code=UTF-8 \
  #     -o ./src/share/locale/en/LC_MESSAGES/OPNsense.pot "${i}"
  # done

For accuracy and simplicicity, the canonical english .pot file should be tracking source changes in this fashion.

Also, generating the base .pot file in this manner has an advantage for developers- if you make proper gettext calls in the code, you simply re-generate the .pot file, (instead of finding and inserting your changes by hand)...

One problem with the line above: the '-L PHP' flag makes a *ton* of C related warnings go away, but not all files in core are actually PHP...  Once this raises itself as a problem, a script generating this .pot file can get more sophicstocated to accomodate.  For now however, most things look like PHP syntax.

Signed-off-by: Isaac (.ike) Levy <ike@blackskyresearch.net>
2015-05-11 01:34:48 -04:00
Isaac (.ike) Levy
d606c30686 This can be generated via xgettext(1) regularly,
If this file is generated regularly, it becomes easier for translators to keep up with changes to the source code.  (Or, at least changes with accompanying gettext calls).

This was generated with:

  # for i in `git grep --name-only 'gettext' | grep -v 'pot$'` ; do
  #  xgettext -j -o ./src/share/locale/en/LC_MESSAGES/OPNsense.pot "${i}"
  # done

Signed-off-by: Isaac (.ike) Levy <ike@blackskyresearch.net>
2015-05-11 00:27:18 -04:00
Isaac (.ike) Levy
72f23c783c completely tool-based approach with xgettext(1)
xgettext(1) is obviously much simpler than creating the canonical .pot file by hand.  (If only I'd have known better before I started this :)

This .pot file was generated from the source code via:

  # for i in `git grep --name-only 'gettext' | grep -v 'pot$'` ; do
  #   xgettext -j -o ./src/share/locale/en/LC_MESSAGES/OPNsense.pot "${i}"
  # done

For this commit, the old header was retained- it will be deleted in the next commit, for ease of scriptable maintinence of the canonical english .pot file.

Signed-off-by: Isaac (.ike) Levy <ike@blackskyresearch.net>
2015-05-11 00:21:44 -04:00
Isaac (.ike) Levy
45d11da97c big deep breath,
Signed-off-by: Isaac (.ike) Levy <ike@blackskyresearch.net>
2015-05-11 00:19:45 -04:00
Ad Schellevis
d849e48e1d (mvc) still some work todo on getTranslator, disable for now§§ 2015-05-10 17:43:56 +00:00
Ad Schellevis
138d62620e Merge branch 'master' of ssh://github.com/opnsense/core 2015-05-10 19:33:44 +02:00
Ad Schellevis
2723668ea3 (mvc) some gettext stuff 2015-05-10 19:33:02 +02:00
Franco Fichtner
87a1e6157a make: generate English .pot file via xgettext
Needs the optional gettext-tools package to run.
2015-05-10 19:25:11 +02:00
Ad Schellevis
f730946c03 (proxy) improve gui code by using the xml template for form handling 2015-05-10 18:54:38 +02:00
Ad Schellevis
623a72fceb (mvc) add xml form handling to base controller
Adds controller functionality to read form definitions from an xml file in [Controller]/forms/ directory to keep Volt template code a bit cleaner an more understandable.
2015-05-10 18:50:38 +02:00
Ad Schellevis
4a7bf0b7c6 (legacy config helpers) fix config section restore for opnsense config's 2015-05-10 12:14:19 +00:00
Ad Schellevis
fd58c9d0cd fix redirect (b43002fe04 (commitcomment-11122583)) 2015-05-10 12:07:29 +00:00
Ad Schellevis
b43002fe04 change default mvc behavior to return to dashboard for non existent pages. 2015-05-09 09:27:03 +02:00
Ad Schellevis
7a59cc8bab proxy, temporary disable transparant mode. 2015-05-08 18:52:06 +02:00
Ad Schellevis
397c56aa06 Proxy fix status check 2015-05-08 16:25:57 +00:00
Ad Schellevis
e472f1322e proxy UI cleanups and move some functionality into the core MVC template 2015-05-08 17:56:51 +02:00
Ad Schellevis
603e91c2a7 correct case statement 2015-05-08 14:48:10 +00:00
Ad Schellevis
30f7751dbf add legacy shortcuts fora proxy 2015-05-08 12:52:06 +00:00
Ad Schellevis
218661d76a add squid proxy to legacy service status page 2015-05-08 12:44:35 +00:00
Ad Schellevis
7a277785b4 add Proxy server to services menu 2015-05-08 12:14:52 +00:00
Ad Schellevis
ef8d083a5e add proxy logging (cache.log) to System logs 2015-05-08 12:10:23 +00:00
Ad Schellevis
6004b05d58 fix dhcpd log file diag, this one isn't handled with syslog 2015-05-08 09:39:28 +00:00
Ad Schellevis
09489e9000 Merge branch 'master' of github.com:opnsense/core 2015-05-08 09:07:45 +00:00
Ad Schellevis
0949ac9192 (proxy feature) add basic auth helper and acl tag 2015-05-08 09:06:55 +00:00
Franco Fichtner
b71288d69f scripts: use describe --always, seems useful ;) 2015-05-07 19:29:05 +02:00
Franco Fichtner
90da6340ef inc: typo in legacy_interface_stats() 2015-05-07 14:29:26 +02:00
Franco Fichtner
76e323986d inc: better safe than sorry 2015-05-07 14:14:15 +02:00
Franco Fichtner
26d16c6a70 inc: rewrote legacy_interface_stats()
Has the benefit of delivering a numer of additional statistics.
2015-05-07 13:53:56 +02:00
Ad Schellevis
81fb425968 (captive portal / traffic shaper) work in progress moving captive portal rule generation into template system
Make room for traffic shaper rules and restructure ipfw rule parsing
2015-05-06 21:20:04 +02:00
Franco Fichtner
034070ef78 pkg: decide about the repo flavour via tools.git 2015-05-06 20:27:28 +02:00
Franco Fichtner
4b197af1ee inc: fix interface rename; mea culpa 2015-05-06 14:46:13 +02:00
Franco Fichtner
c98b514ee6 src: whitespace sweep 2015-05-05 21:35:26 +02:00
Ad Schellevis
1038102596 fix googledrive backup feature, issue with number of backups count and check with previous version 2015-05-05 16:56:37 +00:00
Ad Schellevis
ad306c96de minor cleanup in config handling, reduce xmlparse call overhead 2015-05-05 17:15:14 +02:00
Ad Schellevis
7953e21f0c add XDebug support switch and debugger for development
When using webgrind, use the optional graphviz package for callgraph support
2015-05-05 14:32:57 +00:00
Ad Schellevis
763295921f enable new MVC code by default (http alias and rewrite rules) 2015-05-05 13:13:45 +00:00
Franco Fichtner
0552324595 inc: mute pgrep output as we are relying on it to fail 2015-05-04 20:16:38 +02:00
Franco Fichtner
e40c87ca6a firmware: also clean downloaded packages after install 2015-05-04 10:35:57 +02:00
Franco Fichtner
783363d0ba www: style for ifstats.php 2015-05-04 10:35:27 +02:00
Ad Schellevis
267d589a83 remove getVolume from captive portal radius (non functional)
related to https://github.com/opnsense/core/issues/162
2015-05-04 07:11:59 +00:00