[Bbs2ch-cvs 286] [268] locale を使わないようにした

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2007年 12月 8日 (土) 23:08:41 JST


Revision: 268
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=bbs2ch&view=rev&rev=268
Author:   flyson
Date:     2007-12-08 23:08:40 +0900 (Sat, 08 Dec 2007)

Log Message:
-----------
locale を使わないようにした

Modified Paths:
--------------
    trunk/bbs2chreader/build/chrome.manifest
    trunk/bbs2chreader/chrome/content/bbs2chreader/bbsmenu/page.xul
    trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.xul
    trunk/bbs2chreader/chrome/content/bbs2chreader/board/subscribe.xul
    trunk/bbs2chreader/chrome/content/bbs2chreader/post-wizard.xul
    trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js
    trunk/bbs2chreader/chrome.manifest

Added Paths:
-----------
    trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread-status.properties

Removed Paths:
-------------
    trunk/bbs2chreader/chrome/locale/


-------------- next part --------------
Modified: trunk/bbs2chreader/build/chrome.manifest
===================================================================
--- trunk/bbs2chreader/build/chrome.manifest	2007-12-08 14:06:16 UTC (rev 267)
+++ trunk/bbs2chreader/build/chrome.manifest	2007-12-08 14:08:40 UTC (rev 268)
@@ -1,7 +1,5 @@
 content	bbs2chreader	jar:chrome/bbs2chreader.jar!/content/bbs2chreader/
 skin	bbs2chreader	classic/1.0	jar:chrome/bbs2chreader.jar!/skin/classic/bbs2chreader/
-locale	bbs2chreader	en-US	jar:chrome/bbs2chreader.jar!/locale/en-US/bbs2chreader/
-locale	bbs2chreader	ja-JP	jar:chrome/bbs2chreader.jar!/locale/ja-JP/bbs2chreader/
 overlay	chrome://browser/content/browser.xul	chrome://bbs2chreader/content/ff-overlay.xul
 style	chrome://browser/content/browser.xul	chrome://bbs2chreader/skin/ff-toolbarbutton.css
 style	chrome://global/content/customizeToolbar.xul	chrome://bbs2chreader/skin/ff-toolbarbutton.css
\ No newline at end of file

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/bbsmenu/page.xul
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/bbsmenu/page.xul	2007-12-08 14:06:16 UTC (rev 267)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/bbsmenu/page.xul	2007-12-08 14:08:40 UTC (rev 268)
@@ -2,10 +2,6 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://bbs2chreader/skin/bbsmenu-page.css" type="text/css"?>
 
-<!DOCTYPE page [
-	<!ENTITY % bbsmenu-page-dtd SYSTEM "chrome://bbs2chreader/locale/bbsmenu-page.dtd">
-	%bbsmenu-page-dtd;
-]>
 <page id="pageMain" title="BBSMENU [bbs2chreader]"
 	onload="startup()" onunload="shutdown()"
 	onmousedown="event.stopPropagation()" onkeypress="event.stopPropagation()"
@@ -21,11 +17,11 @@
 <popupset>
 	<popup id="popBbsMenuContext"
 				onpopupshowing="return showBbsMenuContext(event)">
-		<menuitem label="&ctxtOpen.label;" oncommand="openBoard(false)"/>
-		<menuitem label="&ctxtOpenInNewTab.label;" oncommand="openBoard(true)"/>
+		<menuitem label="開く" oncommand="openBoard(false)"/>
+		<menuitem label="新しいタブで開く" oncommand="openBoard(true)"/>
 		<menuseparator/>
-		<menuitem label="&ctxtCopuURL.label;" oncommand="copyURL(false)"/>
-		<menuitem label="&ctxtCopuURLnTitle.label;" oncommand="copyURL(true)"/>
+		<menuitem label="URL をコピー" oncommand="copyURL(false)"/>
+		<menuitem label="URL とタイトルをコピー" oncommand="copyURL(true)"/>
 	</popup>
 </popupset>
 
@@ -34,17 +30,17 @@
 			autocompletesearch="form-history"
 			autocompletesearchparam="bbs2ch-bbsmenu-history"
 			ontextentered="searchTitle(this.value)"/>
-	<toolbarbutton id="btnHistory" label="&history.label;" type="menu">
+	<toolbarbutton id="btnHistory" label="履歴" type="menu">
 		<menupopup id="popHistory" onpopupshowing="updateHistoryMenu()"
 				onclick="popHistoryClick(event)"/>
 	</toolbarbutton>
-	<toolbarbutton label="&tools.label;" type="menu">
+	<toolbarbutton label="ツール" type="menu">
 		<menupopup>
-			<menuitem label="&bbsmenuUpdate.label;" oncommand="bbsmenuUpdate()"/>
+			<menuitem label="bbsmenu æ›´æ–°" oncommand="bbsmenuUpdate()"/>
 			<menuseparator/>
-			<menuitem label="&openLogsDirectory.label;" oncommand="openLogsDir()"/>
-			<menuitem label="&options.label;" oncommand="openSettings()"/>
-			<menuitem label="&about.label;" oncommand="openAbout()"/>
+			<menuitem label="ログディレクトリの表示" oncommand="openLogsDir()"/>
+			<menuitem label="オプション..." oncommand="openSettings()"/>
+			<menuitem label="bbs2chreader について" oncommand="openAbout()"/>
 		</menupopup>
 	</toolbarbutton>
 	<spacer class="small-margin"/>

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.xul
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.xul	2007-12-08 14:06:16 UTC (rev 267)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/board/page.xul	2007-12-08 14:08:40 UTC (rev 268)
@@ -2,10 +2,6 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://bbs2chreader/skin/board-page.css" type="text/css"?>
 
-<!DOCTYPE page [
-	<!ENTITY % board-page-dtd SYSTEM "chrome://bbs2chreader/locale/board-page.dtd">
-	%board-page-dtd;
-]>
 <page id="pageMain" onload="startup()" onunload="shutdown()"
 	onmousedown="eventBubbleCheck(event)" onkeypress="eventBubbleCheck(event)"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@@ -18,27 +14,27 @@
 
 <popupset>
 	<popup id="popAddBookmark" position="after_start">
-		<menuitem label="&ctxtBookmark.label;" oncommand="addBookmark(false)"/>
-		<menuitem label="&ctxtLiveBookmark.label;" oncommand="addBookmark(true)"/>
+		<menuitem label="ブックマーク" oncommand="addBookmark(false)"/>
+		<menuitem label="ライブブックマーク" oncommand="addBookmark(true)"/>
 	</popup>
 
 	<popup id="popTools" position="after_end">
-		<menuitem label="&popShowBrowser.label;" oncommand="showBrowser(false)"
+		<menuitem label="ブラウザで表示" oncommand="showBrowser(false)"
 			onclick="if(event.button==1)showBrowser(true)"/>
-		<menuitem label="&popOpenLogsDir.label;" oncommand="openLogsDir()"/>
+		<menuitem label="ログディレクトリの表示" oncommand="openLogsDir()"/>
 		<menuseparator/>
-		<menuitem label="&popOpenSettings.label;" oncommand="openSettings()"/>
+		<menuitem label="オプション..." oncommand="openSettings()"/>
 	</popup>
 
 	<popup id="popTreeSubjectContext"
 				onpopupshowing="return showTreeSubjectContext(event)">
-		<menuitem label="&ctxtOpen.label;" oncommand="openThread(false)"/>
-		<menuitem label="&ctxtOpenInNewTab.label;" oncommand="openThread(true)"/>
+		<menuitem label="開く" oncommand="openThread(false)"/>
+		<menuitem label="新しいタブで開く" oncommand="openThread(true)"/>
 		<menuseparator/>
-		<menuitem label="&ctxtCopyURL.label;" oncommand="copyURL()"/>
-		<menuitem label="&ctxtCopyURLnTitle.label;" oncommand="copyTitleAndURL()"/>
+		<menuitem label="URL をコピー" oncommand="copyURL()"/>
+		<menuitem label="URL とタイトルをコピー" oncommand="copyTitleAndURL()"/>
 		<menuseparator/>
-		<menuitem label="&ctxtDeleteLog.label;" oncommand="deleteLog()"/>
+		<menuitem label="ログの削除" oncommand="deleteLog()"/>
 	</popup>
 
 	<tooltip id="popBanner" position="after_end"
@@ -57,20 +53,20 @@
 	<hbox id="boxMenu" flex="1" align="center">
 		<label id="lblStatus" crop="end" value="" flex="1"/>
 
-		<label id="lblShowBanner" class="text-link" value="&lblShowBanner.label;"
+		<label id="lblShowBanner" class="text-link" value="バナー表示"
 			onclick="showBanner(event)"/>
 		<label class="menu-separator" value=" | "/>
 
-		<label id="lblTools" class="text-link" value="&lblTools.label;"
+		<label id="lblTools" class="text-link" value="ツール"
 			popup="popTools"/>
 		<label class="menu-separator" value=" | "/>
 
 		<deck id="dckUpdate" selectedIndex="0">
-			<label id="lblUpdate" class="text-link" value="&menuUpdate.label;"
+			<label id="lblUpdate" class="text-link" value="æ›´æ–°;"
 					onclick="subjectUpdate(event)"/>
-			<label id="lblMoveCheck" class="text-link" value="&lblMoveCheck.label;"
+			<label id="lblMoveCheck" class="text-link" value="確認"
 					onclick="boardMoveCheck(event)"/>
-			<label id="lblMoveNewURL" class="text-link" value="&lblMoveNewURL.label;"
+			<label id="lblMoveNewURL" class="text-link" value="移動"
 					onclick="moveNewURL(event)"/>
 		</deck>
 
@@ -81,24 +77,24 @@
 
 <toolbox>
 	<toolbar align="center">
-		<label value="&txtSearch.label;"/>
+		<label value="検索: "/>
 		<textbox id="txtSearch" value="" flex="2" type="autocomplete"
 				autocompletesearch="form-history"
 				autocompletesearchparam="bbs2ch-board-history"
 				onkeypress="searchTitle(event, this.value)"/>
 		<spacer flex="1"/>
 
-		<label value="&lblFilter.label;"/>
+		<label value="フィルタ: "/>
 		<menulist id="mlstFilterLimit" value="-1" persist2="value" oncommand="initTreeSubject()">
 			<menupopup>
-				<menuitem label="ALL" value="-1"/>
-				<menuitem label="TOP 200" value="200"/>
-				<menuitem label="TOP 400" value="400"/>
-				<menuitem label="Subscribing" value="0"/>
+				<menuitem label="すぺて" value="-1"/>
+				<menuitem label="トップ 200" value="200"/>
+				<menuitem label="トップ 400" value="400"/>
+				<menuitem label="購読中" value="0"/>
 			</menupopup>
 		</menulist>
 
-		<checkbox id="chkShowDownedLogs" label="&chkShowDownedLogs.label;"
+		<checkbox id="chkShowDownedLogs" label="過去ログ表示"
 				checked="true" persist2="checked" oncommand="initTreeSubject()"/>
 
 		<spacer class="small-margin"/>
@@ -114,31 +110,31 @@
 				property="status" cellType="icon"
 				persist2="hidden width sortActive sortDirection"/>
 		<splitter class="tree-splitter"/>
-		<treecol id="colNumber" label="&colNumber.label;" flex="1"
+		<treecol id="colNumber" label="No" flex="1"
 				property="number" cellType="int"
 				persist2="hidden width sortActive sortDirection"/>
 		<splitter class="tree-splitter"/>
-		<treecol id="colTitle" label="&colTitle.label;" flex="15"
+		<treecol id="colTitle" label="タイトル" flex="15"
 				property="title" cellType="str"
 				persist2="hidden width sortActive sortDirection"/>
 		<splitter class="tree-splitter"/>
-		<treecol id="colCount" label="&colCount.label;" flex="1"
+		<treecol id="colCount" label="レス数" flex="1"
 				property="count" cellType="int"
 				persist2="hidden width sortActive sortDirection"/>
 		<splitter class="tree-splitter"/>
-		<treecol id="colRead" label="&colRead.label;" flex="1"
+		<treecol id="colRead" label="既読数" flex="1"
 				property="read" cellType="int"
 				persist2="hidden width sortActive sortDirection"/>
 		<splitter class="tree-splitter"/>
-		<treecol id="colUnread" label="&colUnread.label;" flex="1"
+		<treecol id="colUnread" label="未読数" flex="1"
 				property="unread" cellType="int"
 				persist2="hidden width sortActive sortDirection"/>
 		<splitter class="tree-splitter"/>
-		<treecol id="colForce" label="&colForce.label;" flex="1"
+		<treecol id="colForce" label="勢い" flex="1"
 				property="force" cellType="int"
 				persist2="hidden width sortActive sortDirection"/>
 		<splitter class="tree-splitter"/>
-		<treecol id="colMakeDate" label="&colMakeDate.label;" flex="1"
+		<treecol id="colMakeDate" label="作成日" flex="1"
 				property="makeDate" cellType="str"
 				persist2="hidden width sortActive sortDirection"/>
 	</treecols>

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/board/subscribe.xul
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/board/subscribe.xul	2007-12-08 14:06:16 UTC (rev 267)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/board/subscribe.xul	2007-12-08 14:08:40 UTC (rev 268)
@@ -2,10 +2,6 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://bbs2chreader/skin/subscribe.css" type="text/css"?>
 
-<!DOCTYPE page [
-	<!ENTITY % board-page-dtd SYSTEM "chrome://bbs2chreader/locale/board-page.dtd">
-	%board-page-dtd;
-]>
 <page id="pageMain" title="購読 [bbs2chreader]"
 		onload="startup()" onunload="shutdown()"
 		onmousedown="eventBubbleCheck(event)" onkeypress="eventBubbleCheck(event)"
@@ -20,27 +16,27 @@
 <popupset>
 	<popup id="treeSubscribeContext"
 				onpopupshowing="return showTreeSubscribeContext(event)">
-		<menuitem label="&ctxtOpen.label;" oncommand="openThread(false)"/>
-		<menuitem label="&ctxtOpenInNewTab.label;" oncommand="openThread(true)"/>
+		<menuitem label="開く" oncommand="openThread(false)"/>
+		<menuitem label="新しいタブで開く" oncommand="openThread(true)"/>
 		<menuseparator/>
-		<menuitem label="&ctxtCopyURL.label;" oncommand="copyURL()" disabled="true"/>
-		<menuitem label="&ctxtCopyURLnTitle.label;" oncommand="copyTitleAndURL()" disabled="true"/>
+		<menuitem label="URL をコピー" oncommand="copyURL()" disabled="true"/>
+		<menuitem label="タイトルと URL をコピー" oncommand="copyTitleAndURL()" disabled="true"/>
 		<menuseparator/>
-		<menuitem label="&ctxtDeleteLog.label;" oncommand="deleteLog()"/>
+		<menuitem label="ログを削除" oncommand="deleteLog()"/>
 	</popup>
 </popupset>
 
 <hbox align="center">
 	<label id="lblStatus" flex="1" crop="start"/>
 	<spacer class="small-margin"/>
-	<toolbarbutton label="&lblTools.label;" type="menu">
+	<toolbarbutton label="ツール" type="menu">
 		<menupopup>
-				<menuitem label="Manage Subscribe Boards" oncommand="openSubscribeManager()"/>
+				<menuitem label="購読の管理" oncommand="openSubscribeManager()"/>
 				<menuseparator/>
-				<menuitem label="&popOpenSettings.label;" oncommand="openSettings()"/>
+				<menuitem label="オプション..." oncommand="openSettings()"/>
 		</menupopup>
 	</toolbarbutton>
-	<toolbarbutton id="btnUpdate" label="&menuUpdate.label;" oncommand="subjectUpdateAll()"/>
+	<toolbarbutton id="btnUpdate" label="æ›´æ–°" oncommand="subjectUpdateAll()"/>
 	<spacer class="small-margin"/>
 </hbox>
 

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/post-wizard.xul
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/post-wizard.xul	2007-12-08 14:06:16 UTC (rev 267)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/post-wizard.xul	2007-12-08 14:08:40 UTC (rev 268)
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
-
-<!DOCTYPE wizard [
-	<!ENTITY % post-wizard-dtd SYSTEM "chrome://bbs2chreader/locale/post-wizard.dtd">
-	%post-wizard-dtd;
-]>
 <wizard id="wizPostWizard" title="post" windowtype="bbs2ch:postWizard"
 	onload="startup()" onwizardcancel="shutdown()"
 	onwizardfinish="shutdown(); reloadThreadPage()"
@@ -21,14 +16,14 @@
 	<script type="application/javascript;version=1.7" src="chrome://bbs2chreader/content/post/filter.js"/>
 
 	<wizardpage pageid="wpgForm" id="wpgForm" onpageadvanced="return formCheck()"
-			label="&wpgForm.label;" description="&wpgForm.desc;">
+			label="書き込みウィザード" description="マターリ">
 
 		<label id="lblThreadTitle" class="header" value=""/>
 		<spacer class="small-margin"/>
 		<hbox align="center">
-			<label value="&lblMame.value;" style="text-align:right"/>
+			<label value="名前 :" style="text-align:right"/>
 			<textbox id="txtName" value="" flex="2"/>
-			<label value="&lblMail.value;" style="text-align:right"/>
+			<label value="メール :" style="text-align:right"/>
 			<textbox id="txtMail" value="" flex="1"/>
 			<checkbox id="chkSage" label="sage" persist="checked" oncommand="mailDisabled()"/>
 		</hbox>
@@ -43,24 +38,24 @@
 		<hbox align="center" pack="end">
 			<!--<button id="btnRePost" label="この板のディフォルトに設定"/>
 			<button id="btnRePost" label="このスレのディフォルトに設定"/>-->
-			<checkbox id="chkBeLogin" label="&chkBeLogin.label;" oncommand="toggleBeLogin()"/>
+			<checkbox id="chkBeLogin" label="Be ログイン" oncommand="toggleBeLogin()"/>
 		</hbox>
 	</wizardpage>
 
 
 	<wizardpage pageid="wpgPreview" onpageshow="preview()"
-					label="&wpgPreview.label;" description="&wpgPreview.desc;">
+					label="プレビュー" description="次へ進むと実際に書き込みます">
 		<iframe id="bwrPreview" src="about:blank" flex="1" class="box-inset"
 			onload="event.stopPropagation()"/>
 	</wizardpage>
 
 
 	<wizardpage pageid="wpgPost" onpageshow="post()"
-					label="&wpgPost.label;" description="&wpgPost.desc;">
+					label="書き込み中..." description="">
 		<hbox flex="1">
 			<textbox id="txtResponse" multiline="true" readonly="true" flex="1"/>
 			<hbox align="end">
-				<button id="btnRePost" disabled="true" label="&btnRePost.label;" oncommand="post()"/>
+				<button id="btnRePost" disabled="true" label="再書き込み" oncommand="post()"/>
 			</hbox>
 		</hbox>
 	</wizardpage>

Added: trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread-status.properties
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread-status.properties	2007-12-08 14:06:16 UTC (rev 267)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread-status.properties	2007-12-08 14:08:40 UTC (rev 268)
@@ -0,0 +1,8 @@
+ok              = (`・ω・´)「OK」
+dat_down        = ( ーωー)「DAT 落ち」
+not_modified    = ( ーωー)「新着なし」
+abone           = (´・ω・`)「あぼーん発生。右下のバッテンを押してログを消した後再読み込みしてね」
+network_error   = (´・ω・`)「ネットワークエラー」
+error           = (´・ω・`)「エラー : %S」
+offline_mode    = ( ーωー)「オフラインモード」
+log_pickup_mode = ( ーωー)「ログピックアップモード」
\ No newline at end of file

Modified: trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js
===================================================================
--- trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js	2007-12-08 14:06:16 UTC (rev 267)
+++ trunk/bbs2chreader/chrome/content/bbs2chreader/server/thread.js	2007-12-08 14:08:40 UTC (rev 268)
@@ -1283,7 +1283,7 @@
 	    var strBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"]
                                       .getService(Components.interfaces.nsIStringBundleService);
 		var statusBundle = strBundleService.createBundle(
-								"chrome://bbs2chreader/locale/thread-status.properties");
+								"chrome://bbs2chreader/content/server/thread-status.properties");
 		var statusText = "";
 		if(typeof(aStatus) == "string"){
 			try{

Modified: trunk/bbs2chreader/chrome.manifest
===================================================================
--- trunk/bbs2chreader/chrome.manifest	2007-12-08 14:06:16 UTC (rev 267)
+++ trunk/bbs2chreader/chrome.manifest	2007-12-08 14:08:40 UTC (rev 268)
@@ -1,7 +1,5 @@
 content	bbs2chreader	chrome/content/bbs2chreader/
 skin	bbs2chreader	classic/1.0	chrome/skin/classic/bbs2chreader/
-locale	bbs2chreader	en-US	chrome/locale/en-US/bbs2chreader/
-locale	bbs2chreader	ja-JP	chrome/locale/ja-JP/bbs2chreader/
 overlay	chrome://browser/content/browser.xul	chrome://bbs2chreader/content/ff-overlay.xul
 style	chrome://browser/content/browser.xul	chrome://bbs2chreader/skin/ff-toolbarbutton.css
 style	chrome://global/content/customizeToolbar.xul	chrome://bbs2chreader/skin/ff-toolbarbutton.css
\ No newline at end of file


bbs2ch-cvs メーリングリストの案内
Back to archive index