Skip to content

Commit

Permalink
EXM-46873: changed "flat view" to "list view"
Browse files Browse the repository at this point in the history
(cherry picked from commit e031c19)
  • Loading branch information
sorincarbunaru committed Mar 8, 2021
1 parent f644f78 commit 7172d61
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
16 changes: 8 additions & 8 deletions i18n/translation.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,14 @@
<val lang="ja_JP">Unstaged files</val>
<val lang="nl_NL">Unstaged files</val>
</key>
<key value="Change_To_List_View">
<comment>The tooltip for the Change View button when the icon shows the list view icon</comment>
<val lang="en_US">Switch to list view</val>
<val lang="de_DE">Switch to list view</val>
<val lang="fr_FR">Switch to list view</val>
<val lang="ja_JP">Switch to list view</val>
<val lang="nl_NL">Switch to list view</val>
</key>
<key value="Resolve_conflicts_first">
<comment>The message displayed when you push with conflicts</comment>
<val lang="en_US">Resolve the conflicts first.</val>
Expand Down Expand Up @@ -1821,14 +1829,6 @@
<val lang="ja_JP">ja_JP_translation</val>
<val lang="nl_NL">Boomweergave wijzigen</val>
</key>
<key value="Change_Flat_View_Button_ToolTip">
<comment>The tooltip for the ChangeView button when the icon shows the flat view icon</comment>
<val lang="en_US">Switch to flat view</val>
<val lang="de_DE">Zur Pfadansicht wechseln</val>
<val lang="fr_FR">Passer à la vue à plat</val>
<val lang="ja_JP">ja_JP_translation</val>
<val lang="nl_NL">Naar platte weergave</val>
</key>
<key value="Login_Dialog_Private_Repository_Message">
<comment>The text displayed on the first row of the login dialog if the repositroy is private</comment>
<val lang="en_US">This is a private repository. We need your credentials for synchronization.</val>
Expand Down
2 changes: 1 addition & 1 deletion plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<extension type="URLHandler" class="com.oxygenxml.git.protocol.CustomProtocolURLHandlerExtension"/>
<extension type="OptionPage" class="com.oxygenxml.git.OxygenGitOptionPagePluginExtension"/>

<!--The sample view which will present messages from the sample plugin.-->
<!-- The main side-view of the Git Client add-on. -->
<view id="GitStagingView" initialSide="WEST" initialRow="0" initialState="docked">
<perspective id="xslt_debugger" initialState="hidden"/>
<perspective id="xquery_debugger" initialState="hidden"/>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/oxygenxml/git/translator/Tags.java
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ private Tags() {
* The tooltip for the ChangeView button when the icon shows the flat view
* icon
*/
public static final String CHANGE_FLAT_VIEW_BUTTON_TOOLTIP = "Change_Flat_View_Button_ToolTip";
public static final String CHANGE_TO_LIST_VIEW = "Change_To_List_View";

/**
* The text displayed on the first row of the login dialog if the repository
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/oxygenxml/git/view/ChangesPanel.java
Original file line number Diff line number Diff line change
Expand Up @@ -1025,7 +1025,7 @@ private void updateChangeViewButton() {
if (currentViewMode == ResourcesViewMode.TREE_VIEW) {
Icon icon = Icons.getIcon(Icons.LIST_VIEW);
switchViewButton.setIcon(icon);
switchViewButton.setToolTipText(translator.getTranslation(Tags.CHANGE_FLAT_VIEW_BUTTON_TOOLTIP));
switchViewButton.setToolTipText(translator.getTranslation(Tags.CHANGE_TO_LIST_VIEW));
} else {
Icon icon = Icons.getIcon(Icons.TREE_VIEW);
switchViewButton.setIcon(icon);
Expand Down

0 comments on commit 7172d61

Please sign in to comment.