Skip to content

Commit

Permalink
[i18n] Merge similar strings and improve consistency
Browse files Browse the repository at this point in the history
  • Loading branch information
@pedro-mendonca
pedro-mendonca committed Jun 19, 2019
1 parent 7ee9ae5 commit 986e49b
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 30 deletions.
16 changes: 8 additions & 8 deletions languages/wedevs-project-manager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
__( 'Last 30 days', 'wedevs-project-manager' ),
__( 'Users', 'wedevs-project-manager' ),
__( 'Load More ...', 'wedevs-project-manager' ),
__( 'No activity found.', 'wedevs-project-manager' ),
__( 'No activities found.', 'wedevs-project-manager' ),
__( 'Attached to', 'wedevs-project-manager' ),
__( 'by', 'wedevs-project-manager' ),
__( 'admin', 'wedevs-project-manager' ),
Expand All @@ -36,7 +36,7 @@
__( '- Milestone -', 'wedevs-project-manager' ),
__( 'Cancel', 'wedevs-project-manager' ),
__( 'Add Task', 'wedevs-project-manager' ),
__( 'Add new task', 'wedevs-project-manager' ),
__( 'Add New Task', 'wedevs-project-manager' ),
__( 'Assign to', 'wedevs-project-manager' ),
__( 'Task: ', 'wedevs-project-manager' ),
__( 'Search Lists', 'wedevs-project-manager' ),
Expand All @@ -58,9 +58,9 @@
__( 'Filter', 'wedevs-project-manager' ),
__( 'Single List', 'wedevs-project-manager' ),
__( 'This is a system default task list. Any task without an assigned tasklist will appear here.', 'wedevs-project-manager' ),
__( 'No result Found', 'wedevs-project-manager' ),
__( 'No results found.', 'wedevs-project-manager' ),
__( 'Task list name', 'wedevs-project-manager' ),
__( 'No task list found.', 'pm-pro' ),
__( 'No task lists found.', 'pm-pro' ),
__( 'Status', 'wedevs-project-manager' ),
__( 'Completed', 'wedevs-project-manager' ),
__( 'On-going', 'wedevs-project-manager' ),
Expand Down Expand Up @@ -129,7 +129,7 @@
__( 'Provide your App key & Token', 'wedevs-project-manager' ),
__( 'Imports', 'pm-pro' ),
__( 'My Task', 'pm-pro' ),
__( 'No Task Found', 'pm-pro' ),
__( 'No tasks found.', 'pm-pro' ),
__( 'Load More', 'pm-pro' ),
__( 'My Calender', 'pm-pro' ),
__( 'At a glance', 'pm-pro' ),
Expand Down Expand Up @@ -234,7 +234,7 @@
__( 'Add New Project', 'wedevs-project-manager' ),
__( 'Update Project', 'wedevs-project-manager' ),
__( 'Client', 'wedevs-project-manager' ),
__( 'Project title is required!', 'wedevs-project-manager' ),
__( 'Project title is required.', 'wedevs-project-manager' ),
__( 'Create User', 'wedevs-project-manager' ),
__( 'Edit Milestone', 'wedevs-project-manager' ),
__( 'Delete milestone', 'wedevs-project-manager' ),
Expand All @@ -243,7 +243,7 @@
__( 'Milestone name', 'wedevs-project-manager' ),
__( 'Update Milestone', 'wedevs-project-manager' ),
__( 'Create', 'wedevs-project-manager' ),
__( 'Are you sure!', 'wedevs-project-manager' ),
__( 'Are you sure?', 'wedevs-project-manager' ),
__( 'Any', 'wedevs-project-manager' ),
__( 'Over Due', 'wedevs-project-manager' ),
__( 'Today', 'wedevs-project-manager' ),
Expand Down Expand Up @@ -285,4 +285,4 @@
__( 'Check out all the useful modules that would take your project management experience to a whole new level.', 'wedevs-project-manager' ),
__( 'Go to Modules', 'wedevs-project-manager' ),
__( 'Are you sure to delete this project?', 'wedevs-project-manager' ),
];
];
4 changes: 2 additions & 2 deletions src/Search/Controllers/Search_Controller.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public function search_by_client( WP_REST_Request $request ) {
});

if ( empty( $projects ) ) {
$projects = [ [ "no_result" => __( "No result found.", 'pm-pro' )] ];
$projects = [ [ "no_result" => __( "No results found.", 'pm-pro' )] ];
}

return $projects;
Expand Down Expand Up @@ -124,7 +124,7 @@ public function get_all_result( $string, $project_id = false ) {
$items = array_merge( $items, $this->search_in_broad( $string, $project_id ));

if ( empty( $items ) ) {
$items = [ [ "no_result" => __( "No result found.", 'pm-pro' ) ]];
$items = [ [ "no_result" => __( "No results found.", 'pm-pro' ) ]];
}

return $items;
Expand Down
12 changes: 6 additions & 6 deletions texts/activities.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
['actor.data.display_name', 'meta.task_list_title']
],
'delete_task_list' => [
__( '%1$s has Deleted a task list titled as %2$s.', 'wedevs-project-manager' ),
__( '%1$s has deleted a task list titled as %2$s.', 'wedevs-project-manager' ),
['actor.data.display_name', 'meta.deleted_task_list_title']
],
'update_task_list_title' => [
Expand All @@ -87,7 +87,7 @@
['actor.data.display_name', 'meta.task_list_title']
],
'restore_task_list' => [
__( '%1$s has restore a task list, %2$s.', 'wedevs-project-manager' ),
__( '%1$s has restored a task list, %2$s.', 'wedevs-project-manager' ),
['actor.data.display_name', 'meta.task_list_title']
],

Expand All @@ -97,7 +97,7 @@
['actor.data.display_name', 'meta.milestone_title']
],
'delete_milestone' => [
__( '%1$s has Deleted a milestone, %2$s.', 'wedevs-project-manager' ),
__( '%1$s has deleted a milestone, %2$s.', 'wedevs-project-manager' ),
['actor.data.display_name', 'meta.deleted_milestone_title']
],
'update_milestone_title' => [
Expand Down Expand Up @@ -159,7 +159,7 @@
['actor.data.display_name', 'meta.task_title', 'meta.task_payable_old', 'meta.task_payable_new']
],
'update_task_recurrent' => [
__( '%1$s has updated the recurrency of a task, %2$s, %3$s to %4$s.', 'wedevs-project-manager' ),
__( '%1$s has updated the recurrency of a task, %2$s, from %3$s to %4$s.', 'wedevs-project-manager' ),
['actor.data.display_name', 'meta.task_title', 'meta.task_recurrent_old', 'meta.task_recurrent_new']
],
'update_task_status' => [
Expand Down Expand Up @@ -325,11 +325,11 @@

// duplicate project
'duplicate_project' => [
__( '%1$s has duplicated project from , %2$s.', 'wedevs-project-manager'),
__( '%1$s has duplicated project from, %2$s.', 'wedevs-project-manager'),
['actor.data.display_name', 'meta.old_project_title']
],
'duplicate_list' => [
__( '%1$s has duplicated list from , %2$s.', 'wedevs-project-manager'),
__( '%1$s has duplicated list from, %2$s.', 'wedevs-project-manager'),
['actor.data.display_name', 'meta.old_task_list_title']
],
];
2 changes: 1 addition & 1 deletion views/assets/src/components/my-tasks/complete-task.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
</li>
</ul>
<div class="no-task" v-if="!projects.length">
<p>{{ __("No Task Found", 'pm-pro') }}</p>
<p>{{ __("No tasks found.", 'pm-pro') }}</p>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion views/assets/src/components/my-tasks/current-task.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</li>
</ul>
<div class="no-task" v-if="!projects.length">
<p>{{ __("No Task Found", 'pm-pro') }}</p>
<p>{{ __("No tasks found.", 'pm-pro') }}</p>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion views/assets/src/components/my-tasks/outstanding-task.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</li>
</ul>
<div class="no-task" v-if="!hasOutstandingTask">
<p>{{ __("No Task Found", 'pm-pro') }}</p>
<p>{{ __("No tasks found.", 'pm-pro') }}</p>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion views/assets/src/components/project-activities/activities.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

<a v-if="total_activity>loaded_activities" href="#" @click.prevent="loadMore()" class="button pm-load-more">{{ __( 'Load More ...', 'wedevs-project-manager') }}</a>
<span v-show="show_spinner" class="pm-spinner"></span>
<div v-if="!activities.length" class="no-activity" > {{ __( 'No activity found.', 'wedevs-project-manager') }} </div>
<div v-if="!activities.length" class="no-activity" > {{ __( 'No activities found.', 'wedevs-project-manager') }} </div>
</div>

<router-view name="singleTask"></router-view>
Expand Down
5 changes: 1 addition & 4 deletions views/assets/src/components/project-lists/project-create-form.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@
}
if ( !this.project.title ) {
pm.Toastr.error(__('Project title is required!', 'wedevs-project-manager'));
pm.Toastr.error(__('Project title is required.', 'wedevs-project-manager'));
return;
}
Expand Down Expand Up @@ -319,6 +319,3 @@
export default new_project_form;
</script>



4 changes: 2 additions & 2 deletions views/assets/src/components/project-overview/mixin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default {
saveUsers () {

if (!this.project.title) {
pm.Toastr.error(__('Project title is required!', 'wedevs-project-manager'));
pm.Toastr.error(__('Project title is required.', 'wedevs-project-manager'));
return;
}

Expand Down Expand Up @@ -95,7 +95,7 @@ export default {
},

deleteUser (del_user) {
if(!confirm(__('Are you sure!', 'wedevs-project-manager'))) {
if(!confirm(__('Are you sure?', 'wedevs-project-manager'))) {
return;
}
if ( !this.canUserEdit(del_user.id) ) {
Expand Down
6 changes: 3 additions & 3 deletions views/assets/src/components/project-task-lists/lists.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@

<li v-if="!lists.length">
<div class="todos-wrap no-task">
<center><span v-if="isListFetch">{{ __( 'No result Found', 'wedevs-project-manager') }}</span></center>
<center><span v-if="isListFetch">{{ __( 'No results found.', 'wedevs-project-manager') }}</span></center>

</div>
</li>
Expand All @@ -160,7 +160,7 @@
</div>

<!-- <div class="todos-wrap no-task">
<span>{{ __( 'No result Found', 'wedevs-project-manager') }}</span>
<span>{{ __( 'No results found.', 'wedevs-project-manager') }}</span>
</div> -->
</div>
Expand Down Expand Up @@ -188,7 +188,7 @@
@search-change="asyncFind($event)"
label="title"
track-by="id">
<span slot="noResult">{{ __( 'No task list found.', 'pm-pro' ) }}</span>
<span slot="noResult">{{ __( 'No task lists found.', 'pm-pro' ) }}</span>

</multiselect>
</div>
Expand Down
2 changes: 1 addition & 1 deletion views/assets/src/components/project-task-lists/new-task-form.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<span class="plus-text" v-if="!show_spinner">+</span>
<span class="pm-spinner" v-if="show_spinner"></span>
</div>
<input @keyup.enter="taskFormAction()" v-model="task.title" class="input-field" :placeholder="__('Add new task', 'wedevs-project-manager')" type="text" ref="taskForm">
<input @keyup.enter="taskFormAction()" v-model="task.title" class="input-field" :placeholder="__('Add New Task', 'wedevs-project-manager')" type="text" ref="taskForm">
<a @click.prevent="taskFormAction()" class="update-button" href="#"><span class="icon-pm-check-circle"></span></a>
<div class="action-icons">
<pm-do-action hook="pm_task_form" :actionData="task"></pm-do-action>
Expand Down

0 comments on commit 986e49b

Please sign in to comment.