Skip to content

Commit

Permalink
Merge pull request getodk#5769 from seadowg/to-review
Browse files Browse the repository at this point in the history
Add custom attribute to flag strings to review
  • Loading branch information
seadowg committed Oct 24, 2023
1 parent 49ebda1 commit 5aa4b87
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:

- run:
name: Run code quality checks
command: ./gradlew pmd ktlintCheck checkstyle lintDebug -PlintStrings
command: ./gradlew pmd ktlintCheck checkstyle lintDebug

test_modules:
<<: *android_config
Expand Down
4 changes: 0 additions & 4 deletions collect_app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -207,10 +207,6 @@ android {
htmlReport true
lintConfig file("$rootDir/config/lint.xml")
xmlReport true

if (!project.hasProperty("lintStrings")) {
disable += ["HardcodedText"]
}
}
namespace 'org.odk.collect.android'
}
Expand Down
12 changes: 6 additions & 6 deletions strings/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
the specific language governing permissions and limitations under the
License.
-->
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation" tools:locale="en">
<resources xmlns:tools="http://schemas.android.com/tools" xmlns:oat="http://schema.getodk.org/odkAndroidTools" tools:ignore="MissingTranslation" tools:locale="en">
<!-- Text for the topmost button on the main screen. It should be short and action-oriented. -->
<string name="enter_data">Start new form</string>
<!-- Text for an action button on the main screen. -->
Expand Down Expand Up @@ -1234,7 +1234,7 @@
<string name="edit_finalized_form_deprecation_message" tools:ignore="UnusedResources">In later versions, finalized forms will no longer be editable.</string>

<!-- Label for Drafts list option that attempts to finalize all the drafts the user is currently looking at. Finalizing a draft locks it so it can't be edited and makes it eligible for autosend -->
<string name="finalize_all_drafts" tools:ignore="UnusedResources">Finalize all drafts</string>
<string name="finalize_all_drafts" oat:toReview="true">Finalize all drafts</string>

<!-- Dialog title that asks if the user wants to finalize all drafts -->
<plurals name="bulk_finalize_confirmation" tools:ignore="UnusedResources">
Expand All @@ -1246,22 +1246,22 @@
<string name="bulk_finalize_explanation" tools:ignore="UnusedResources">Once you finalize all drafts, they will be in "Ready to send" and you will not be able to make edits. Any drafts that have errors will not be finalized.\n\nYou will not be able to undo this action.</string>

<!-- Message shown after bulk finalization when finalizing all drafts has succeeded -->
<plurals name="bulk_finalize_success" tools:ignore="UnusedResources">
<plurals name="bulk_finalize_success" oat:toReview="true">
<item quantity="one">Success! %d draft finalized.</item>
<item quantity="other">Success! %d drafts finalized.</item>
</plurals>

<!-- Message shown after bulk finalization when no drafts finalized successfully -->
<plurals name="bulk_finalize_failure" tools:ignore="UnusedResources">
<plurals name="bulk_finalize_failure" oat:toReview="true">
<item quantity="one">%d draft has errors that must be addressed before finalizing.</item>
<item quantity="other">%d drafts have errors that must be addressed before finalizing.</item>
</plurals>

<!-- Message shown after bulk finalization when some drafts finalize successfully and others fail -->
<string name="bulk_finalize_partial_success" tools:ignore="UnusedResources">%d drafts finalized. %d drafts have errors that must be addressed before finalizing.</string>
<string name="bulk_finalize_partial_success" oat:toReview="true">%d drafts finalized. %d drafts have errors that must be addressed before finalizing.</string>

<!-- Message above a form draft that has not yet been completed -->
<string name="incomplete" tools:ignore="UnusedResources">Incomplete</string>
<string name="incomplete" oat:toReview="true">Incomplete</string>

<!-- Message shown when some drafts finalize successfully but others need to be finalized manually -->
<string name="bulk_finalize_unsupported" tools:ignore="UnusedResources">%d drafts finalized. Drafts that are left need to be finalized manually.</string>
Expand Down

0 comments on commit 5aa4b87

Please sign in to comment.