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.

Sign up for GitHub

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

Make "Spaces" non-translatable #3939

Merged
merged 1 commit into from
Feb 27, 2023
Merged

Make "Spaces" non-translatable #3939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,7 @@ class FileDisplayActivity : FileActivity(),
FileListOption.AV_OFFLINE -> getString(R.string.drawer_item_only_available_offline)
FileListOption.SHARED_BY_LINK -> getString(R.string.drawer_item_shared_by_link_files)
FileListOption.ALL_FILES -> getString(R.string.default_display_name_for_root_folder)
FileListOption.SPACES_LIST -> getString(R.string.drawer_item_spaces)
FileListOption.SPACES_LIST -> getString(R.string.bottom_nav_spaces)
}
setupRootToolbar(title, isSearchEnabled = fileListOption != FileListOption.SPACES_LIST)
mainFileListFragment?.setSearchListener(findViewById(R.id.root_toolbar_search_view))
Expand Down
2 changes: 0 additions & 2 deletions owncloudApp/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<string name="actionbar_sort_title">Sort by</string>
<string name="drawer_item_all_files">All files</string>
<string name="drawer_item_only_available_offline">Available offline</string>
<string name="drawer_item_spaces">Spaces</string>
<string name="drawer_item_shared_by_link_files">Shared by link</string>
<string name="drawer_item_settings">Settings</string>
<string name="drawer_item_uploads_list">Uploads</string>
Expand Down Expand Up @@ -115,7 +114,6 @@
<!-- Bottom navigation bar -->
<string name="bottom_nav_files">Files</string>
<string name="bottom_nav_personal">Personal</string>
<string name="bottom_nav_spaces">Spaces</string>
<string name="bottom_nav_uploads">Uploads</string>
<string name="bottom_nav_offline">Offline</string>
<string name="bottom_nav_links">Links</string>
Expand Down
5 changes: 4 additions & 1 deletion owncloudApp/src/main/res/values/strings__not_to_translate.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?><!--
ownCloud Android client application

Copyright (C) 2020 ownCloud GmbH.
Copyright (C) 2023 ownCloud GmbH.

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2,
Expand Down Expand Up @@ -37,4 +37,7 @@
<string name="allow_screenshots_configuration_feedback_ok">The preference for allowing screenshots was set correctly</string>
<string name="oauth2_open_id_scope_configuration_feedback_ok">The OpenID Connect scope was set correctly</string>

<!-- Spaces -->
<string name="bottom_nav_spaces">Spaces</string>

</resources>