Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modify default language to en #40

Merged
merged 1 commit into from
Nov 7, 2024
Merged

Modify default language to en #40

merged 1 commit into from
Nov 7, 2024

Conversation

HashidaTKS
Copy link
Contributor

@HashidaTKS HashidaTKS commented Nov 6, 2024

Modify default language to en.

  • Rename Resources.resx -> Resources.ja.resx
  • Rename Resources.en.resx -> Resources.resx
  • Modify to install the ja resource in setup

Test

How to change Outlook display language:

  1. Select File tab
  2. Select Option button
  3. Select Language tab
  4. Change display language
  5. Restart Outlook
  • Confirm that if Outlook display language is Japanese, FlexConfirmMail uses Japanese.
  • Confirm that if Outlook display language is English, FlexConfirmMail uses English.
  • Confirm that if Outlook display language is Chinese, FlexConfirmMail uses Chinese
  • Confirm that if Outlook display language is Spanish, FlexConfirmMail uses Spanish.
  • Confirm that if Outlook display language is Deutsch, FlexConfirmMail uses English.

@HashidaTKS HashidaTKS requested a review from piroor November 7, 2024 02:48
@@ -125,98 +125,98 @@
<value>..\Resources\logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
Copy link
Contributor Author

@HashidaTKS HashidaTKS Nov 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

説明に記載の通り、実際に行っているのは

  • Resources.resxからResources.ja.resxへのリネーム
  • Resources.en.resxからResources.resxへのリネーム

なのだが、差分表示ではリネーム扱いではなくて

  • Resources.resxの新旧差分比較
  • Resources.en.resxResources.ja.resxの差分比較

が表示されている。なぜなのだろう。

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

改行コードが変わってしまっている...?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/FlexConfirmMail/Outlook-VSTO-Addin/pull/40/files?diff=unified&w=1 で見ると #41 と同じ差分になるので、改行コードの違いが原因のように見えます

@piroor
Copy link
Member

piroor commented Nov 7, 2024

#41 とdiffの出方が違うようですが、これは改行コードの関係でしょうか?

@HashidaTKS HashidaTKS force-pushed the modiy-default-lang-to-en branch from 41bf3e2 to 2507de7 Compare November 7, 2024 03:03
@HashidaTKS HashidaTKS force-pushed the modiy-default-lang-to-en branch from 2507de7 to 4b5ac0e Compare November 7, 2024 03:06
@HashidaTKS
Copy link
Contributor Author

すみません、autocrlfの設定がinputになっていまして、手元ではCRLFで差分が問題なかったのですが、コミットしたタイミングでLFに代わって予期せぬ差分が出ていました。
改行コードをCRLFに直しました。

Copy link
Member

@piroor piroor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

差分を確認した限りではおかしい所はないのでよいと思います!

@piroor piroor merged commit 22c1641 into master Nov 7, 2024
1 check passed
@piroor piroor deleted the modiy-default-lang-to-en branch November 7, 2024 03:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants