文字列リソースRefreshTimelineText1,2をstring.Formatの書式を使うように修正

diff --git a/OpenTween/Properties/Resources.Designer.cs b/OpenTween/Properties/Resources.Designer.cs
index 40e5acc..28a97ef 100644 (file)
--- a/OpenTween/Properties/Resources.Designer.cs
+++ b/OpenTween/Properties/Resources.Designer.cs
@@ -2000,24 +2000,6 @@ namespace OpenTween.Properties {
         }
         
         /// <summary>
-        ///   新着 に類似しているローカライズされた文字列を検索します。
-        /// </summary>
-        internal static string RefreshDirectMessageText1 {
-            get {
-                return ResourceManager.GetString("RefreshDirectMessageText1", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   件 に類似しているローカライズされた文字列を検索します。
-        /// </summary>
-        internal static string RefreshDirectMessageText2 {
-            get {
-                return ResourceManager.GetString("RefreshDirectMessageText2", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Recent更新中... に類似しているローカライズされた文字列を検索します。
         /// </summary>
         internal static string RefreshStripMenuItem_ClickText1 {
@@ -2045,20 +2027,11 @@ namespace OpenTween.Properties {
         }
         
         /// <summary>
-        ///   新着 に類似しているローカライズされた文字列を検索します。
-        /// </summary>
-        internal static string RefreshTimelineText1 {
-            get {
-                return ResourceManager.GetString("RefreshTimelineText1", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   件 に類似しているローカライズされた文字列を検索します。
+        ///   新着 {0} 件 に類似しているローカライズされた文字列を検索します。
         /// </summary>
-        internal static string RefreshTimelineText2 {
+        internal static string RefreshTimeline_NotifyText {
             get {
-                return ResourceManager.GetString("RefreshTimelineText2", resourceCulture);
+                return ResourceManager.GetString("RefreshTimeline_NotifyText", resourceCulture);
             }
         }
         

diff --git a/OpenTween/Properties/Resources.en.resx b/OpenTween/Properties/Resources.en.resx
index be15c51..93906fe 100644 (file)
--- a/OpenTween/Properties/Resources.en.resx
+++ b/OpenTween/Properties/Resources.en.resx
@@ -339,12 +339,6 @@
   <data name="PostWorker_RunWorkerCompletedText5" xml:space="preserve">
     <value>Recent refreshing...</value>
   </data>
-  <data name="RefreshDirectMessageText1" xml:space="preserve">
-    <value>New</value>
-  </data>
-  <data name="RefreshDirectMessageText2" xml:space="preserve">
-    <value>tweets</value>
-  </data>
   <data name="RefreshStripMenuItem_ClickText1" xml:space="preserve">
     <value>Recent refreshing...</value>
   </data>
@@ -354,11 +348,8 @@
   <data name="RefreshStripMenuItem_ClickText3" xml:space="preserve">
     <value>DMRcv refreshing...</value>
   </data>
-  <data name="RefreshTimelineText1" xml:space="preserve">
-    <value>New</value>
-  </data>
-  <data name="RefreshTimelineText2" xml:space="preserve">
-    <value>tweets</value>
+  <data name="RefreshTimeline_NotifyText" xml:space="preserve">
+    <value>New {0} tweets</value>
   </data>
   <data name="RefreshTimelineText3" xml:space="preserve">
     <value>Load log</value>

diff --git a/OpenTween/Properties/Resources.resx b/OpenTween/Properties/Resources.resx
index 37ea278..be08c65 100644 (file)
--- a/OpenTween/Properties/Resources.resx
+++ b/OpenTween/Properties/Resources.resx
@@ -370,12 +370,6 @@
   <data name="Refresh4" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\re4.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="RefreshDirectMessageText1" xml:space="preserve">
-    <value>新着</value>
-  </data>
-  <data name="RefreshDirectMessageText2" xml:space="preserve">
-    <value>件</value>
-  </data>
   <data name="RefreshStripMenuItem_ClickText1" xml:space="preserve">
     <value>Recent更新中...</value>
   </data>
@@ -385,11 +379,8 @@
   <data name="RefreshStripMenuItem_ClickText3" xml:space="preserve">
     <value>DMRcv更新中...</value>
   </data>
-  <data name="RefreshTimelineText1" xml:space="preserve">
-    <value>新着</value>
-  </data>
-  <data name="RefreshTimelineText2" xml:space="preserve">
-    <value>件</value>
+  <data name="RefreshTimeline_NotifyText" xml:space="preserve">
+    <value>新着 {0} 件</value>
   </data>
   <data name="RefreshTimelineText3" xml:space="preserve">
     <value>ログ読込</value>

diff --git a/OpenTween/Properties/Resources.zh-CHS.resx b/OpenTween/Properties/Resources.zh-CHS.resx
index b9509a3..0cb23ff 100644 (file)
--- a/OpenTween/Properties/Resources.zh-CHS.resx
+++ b/OpenTween/Properties/Resources.zh-CHS.resx
@@ -339,12 +339,6 @@
   <data name="PostWorker_RunWorkerCompletedText5" xml:space="preserve">
     <value>正在刷新...</value>
   </data>
-  <data name="RefreshDirectMessageText1" xml:space="preserve">
-    <value>新</value>
-  </data>
-  <data name="RefreshDirectMessageText2" xml:space="preserve">
-    <value>消息</value>
-  </data>
   <data name="RefreshStripMenuItem_ClickText1" xml:space="preserve">
     <value>正在刷新...</value>
   </data>
@@ -354,11 +348,8 @@
   <data name="RefreshStripMenuItem_ClickText3" xml:space="preserve">
     <value>DM接收正在刷新...</value>
   </data>
-  <data name="RefreshTimelineText1" xml:space="preserve">
-    <value>新</value>
-  </data>
-  <data name="RefreshTimelineText2" xml:space="preserve">
-    <value>消息</value>
+  <data name="RefreshTimeline_NotifyText" xml:space="preserve">
+    <value>新 {0} 消息</value>
   </data>
   <data name="RefreshTimelineText3" xml:space="preserve">
     <value>加载日志</value>

diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index 65464eb..1b1cf5b 100644 (file)
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -1773,10 +1773,7 @@ namespace OpenTween
                                 //NotifyIcon1.BalloonTipTitle += Application.ProductName + " [DM] " + Properties.Resources.RefreshDirectMessageText1 + " " + addCount.ToString() + Properties.Resources.RefreshDirectMessageText2;
                                 title.Append(Application.ProductName);
                                 title.Append(" [DM] ");
-                                title.Append(Properties.Resources.RefreshDirectMessageText1);
-                                title.Append(" ");
-                                title.Append(addCount);
-                                title.Append(Properties.Resources.RefreshDirectMessageText2);
+                                title.AppendFormat(Properties.Resources.RefreshTimeline_NotifyText, addCount);
                                 nt = GrowlHelper.NotifyType.DirectMessage;
                             }
                             else if (reply)
@@ -1785,10 +1782,7 @@ namespace OpenTween
                                 //NotifyIcon1.BalloonTipTitle += Application.ProductName + " [Reply!] " + Properties.Resources.RefreshTimelineText1 + " " + addCount.ToString() + Properties.Resources.RefreshTimelineText2;
                                 title.Append(Application.ProductName);
                                 title.Append(" [Reply!] ");
-                                title.Append(Properties.Resources.RefreshTimelineText1);
-                                title.Append(" ");
-                                title.Append(addCount);
-                                title.Append(Properties.Resources.RefreshTimelineText2);
+                                title.AppendFormat(Properties.Resources.RefreshTimeline_NotifyText, addCount);
                                 nt = GrowlHelper.NotifyType.Reply;
                             }
                             else
@@ -1797,10 +1791,7 @@ namespace OpenTween
                                 //NotifyIcon1.BalloonTipTitle += Application.ProductName + " " + Properties.Resources.RefreshTimelineText1 + " " + addCount.ToString() + Properties.Resources.RefreshTimelineText2;
                                 title.Append(Application.ProductName);
                                 title.Append(" ");
-                                title.Append(Properties.Resources.RefreshTimelineText1);
-                                title.Append(" ");
-                                title.Append(addCount);
-                                title.Append(Properties.Resources.RefreshTimelineText2);
+                                title.AppendFormat(Properties.Resources.RefreshTimeline_NotifyText, addCount);
                                 nt = GrowlHelper.NotifyType.Notify;
                             }
                             string bText = sb.ToString();
@@ -1851,10 +1842,7 @@ namespace OpenTween
                             ntIcon = ToolTipIcon.Warning;
                             title.Append(Application.ProductName);
                             title.Append(" [DM] ");
-                            title.Append(Properties.Resources.RefreshDirectMessageText1);
-                            title.Append(" ");
-                            title.Append(addCount);
-                            title.Append(Properties.Resources.RefreshDirectMessageText2);
+                            title.AppendFormat(Properties.Resources.RefreshTimeline_NotifyText, addCount);
                         }
                         else if (reply)
                         {
@@ -1863,10 +1851,7 @@ namespace OpenTween
                             ntIcon = ToolTipIcon.Warning;
                             title.Append(Application.ProductName);
                             title.Append(" [Reply!] ");
-                            title.Append(Properties.Resources.RefreshTimelineText1);
-                            title.Append(" ");
-                            title.Append(addCount);
-                            title.Append(Properties.Resources.RefreshTimelineText2);
+                            title.AppendFormat(Properties.Resources.RefreshTimeline_NotifyText, addCount);
                         }
                         else
                         {
@@ -1875,10 +1860,7 @@ namespace OpenTween
                             ntIcon = ToolTipIcon.Info;
                             title.Append(Application.ProductName);
                             title.Append(" ");
-                            title.Append(Properties.Resources.RefreshTimelineText1);
-                            title.Append(" ");
-                            title.Append(addCount);
-                            title.Append(Properties.Resources.RefreshTimelineText2);
+                            title.AppendFormat(Properties.Resources.RefreshTimeline_NotifyText, addCount);
                         }
                         string bText = sb.ToString();
                         if (string.IsNullOrEmpty(bText)) return;