Changeset 6eecd74 in git

Timestamp:

2012-08-01T08:00:21Z (7 years ago)

Author:

Xuefer <xuefer@…>

Branches:

3.0, 3.1, 3.2, master, trunk

Children:

89795c7

Parents:

fda586a

Message:

devel: use gettext to scan translate string

git-svn-id: ​svn://svn.lighttpd.net/xcache/trunk@1101 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

Files:

• devel/prepare.mak (modified) (2 diffs)
• devel/run (modified) (1 diff)
• devel/updatelangphp.awk (added)
• htdocs/cacher/index.php (modified) (1 diff)
• htdocs/cacher/lang/en.po (added)
• htdocs/cacher/lang/zh-simplified.po (added)
• htdocs/cacher/lang/zh-traditional.po (added)
• htdocs/cacher/listentries.tpl.php (modified) (1 diff)
• htdocs/cacher/sub/entrylist.tpl.php (modified) (2 diffs)
• htdocs/cacher/sub/summary.tpl.php (modified) (1 diff)
• htdocs/common/lang/en.po (added)
• htdocs/common/lang/zh-simplified.po (added)
• htdocs/common/lang/zh-traditional.po (added)
• htdocs/coverager/lang/en.php (modified) (1 diff)
• htdocs/coverager/lang/en.po (added)
• htdocs/coverager/lang/zh-simplified.po (added)
• htdocs/diagnosis/lang/en.po (added)
• htdocs/diagnosis/lang/zh-simplified.po (added)

devel/prepare.mak

@@ -6 +6 @@
 .PHONY: dummy
 .PHONY: all
-all: xcache/xc_opcode_spec_def.h xc_const_string tags
+all: xcache/xc_opcode_spec_def.h xc_const_string tags po
 
 .PHONY: clean
-clean: clean_xc_const_string
+clean: clean_xc_const_string clean_po
     rm -f tags xcache/xc_opcode_spec_def.h
 
@@ -97 +97 @@
     "$(CTAGS)" -R . "${PHP_DEVEL_DIR}/main" "${PHP_DEVEL_DIR}/Zend" "${PHP_DEVEL_DIR}/TSRM" "${PHP_DEVEL_DIR}/ext/standard"
 endif
+
+.PHONY: po
+define htdocspo
+  po: \
+    htdocs/$(1)/lang/en.po \
+    htdocs/$(1)/lang/en.po-merged \
+    htdocs/$(1)/lang/zh-simplified.po-merged \
+    htdocs/$(1)/lang/zh-simplified.po \
+    htdocs/$(1)/lang/zh-traditional.po \
+    htdocs/$(1)/lang/zh-traditional.po-merged
+
+  htdocs/$(1)/lang/%.po-merged: htdocs/$(1)/lang/%.po htdocs/$(1)/lang/$(1).pot
+    msgmerge -o "$$@".tmp $$^
+    mv "$$@".tmp "$$@"
+
+  htdocs/$(1)/lang/%.po:
+    touch "$$@"
+
+  htdocs/$(1)/lang/$(1).pot:
+    xgettext --keyword=_T --keyword=N_ --from-code=UTF-8 -F -D htdocs/$(1)/ $$(subst htdocs/$(1)/,,$$^) -o "$$@".tmp
+    mv "$$@".tmp "$$@"
+
+  htdocs/$(1)/lang/$(1).pot: $(shell find htdocs/$(1) -type f | grep php | grep -v lang | grep -v config)
+
+endef
+
+$(eval $(call htdocspo,cacher))
+$(eval $(call htdocspo,common))
+$(eval $(call htdocspo,coverager))
+$(eval $(call htdocspo,diagnosis))
+
+.PHONY: clean_po
+clean_po: clean_pot
+    rm -f htdocs/*/lang/*.po-merged
+
+.PHONY: clean_pot
+clean_pot:
+    rm -f htdocs/*/lang/*.pot

devel/run

@@ -16 +16 @@
 prep*)
     exec $MAKE -f devel/prepare.mak "${args[@]}"
+    ;;
+*langphp)
+    find htdocs -iname '*.po' | while read -r i; do
+        echo updateing $i
+        devel/updatelangphp.awk < $i
+    done
+    exit
+    ;;
+mergepo)
+    ./run prep
+    find htdocs -iname '*.po' | while read -r i; do
+        if [[ -f $i-merged ]]; then
+            mv $i-merged $i
+        fi
+    done
+    exit
     ;;
 tags)

htdocs/cacher/index.php

@@ -228 +228 @@
     $entryList = array('cache_list' => array(), 'deleted_list' => array());
     if ($_GET['do'] == 'listphp') {
-        $entryList['type_name'] = 'php';
         $entryList['type'] = XC_TYPE_PHP;
     }
     else {
-        $entryList['type_name'] = 'var';
         $entryList['type'] = XC_TYPE_VAR;
     }

htdocs/cacher/listentries.tpl.php

@@ -4 +4 @@
 <?php
 $entryList = getEntryList();
-$isphp = $entryList['type'] == 'listphp';
-$typeName = $entryList['type_name'];
+$isphp = $entryList['type'] == XC_TYPE_PHP;
 ob_start($config['path_nicer']);
 
 $listName = 'Cached';
 $entries = $entryList['cache_list'];
+$caption = $isphp ? _T("php Cached") : _T("var Cached");
 include "./sub/entrylist.tpl.php";
 
 $listName = 'Deleted';
+$caption = $isphp ? _T("php Deleted") : _T("var Deleted");
 $entries = $entryList['deleted_list'];
 include "./sub/entrylist.tpl.php";

htdocs/cacher/sub/entrylist.tpl.php

@@ -2 +2 @@
 <form action="" method="post">
     <table cellspacing="0" cellpadding="4" class="cycles entries">
-        <caption><?php echo _T("$typeName $listName"); ?></caption>
+        <caption><?php echo $caption; ?></caption>
 <?php
 
@@ -12 +12 @@
 if ($isphp) {
     echo
-        th("entry.id")
+        th(N_("entry.id"))
         ;
 }
 else {
     echo
-        th("entry.remove")
+        th(N_("entry.remove"))
         ;
 }

htdocs/cacher/sub/summary.tpl.php

@@ -132 +132 @@
     <div class="legendtitle"><?php echo _T('Legends:'); ?></div>
     <div class="legend pvalue">&nbsp;&nbsp;</div>
-    <div class="legendtitle"><?php echo _T($config['percent_graph_type'] == 'free' ? '% Free' : '% Used'); ?></div>
+    <div class="legendtitle"><?php echo $config['percent_graph_type'] == 'free' ? _T('% Free') : _T('% Used'); ?></div>
     <div class="legend" style="background: rgb(0,0,255)">&nbsp;&nbsp;</div>
-    <div class="legendtitle"><?php echo _T($config['percent_graph_type'] == 'free' ? 'Free Blocks' : 'Used Blocks'); ?></div>
+    <div class="legendtitle"><?php echo $config['percent_graph_type'] == 'free' ? _T('Free Blocks') : _T('Used Blocks'); ?></div>
     <div class="legend" style="background: rgb(255,0,0)">&nbsp;&nbsp;</div>
     <div class="legendtitle"><?php echo _T('Hits'); ?></div>

htdocs/coverager/lang/en.php

@@ -1 +1 @@
 <?php
 
-$GLOBALS['show_todo_strings'] = false;
-
 ?>