Skip to content

Commit cd0f42c

Browse files
committed
Alphabetized language files, more for #151, refactoring language string hierarchy.
1 parent 2fe66c1 commit cd0f42c

File tree

29 files changed

+199
-169
lines changed

29 files changed

+199
-169
lines changed
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
22

33
return array(
4-
'update_category' => 'Update Category',
5-
'create_category' => 'Create Category',
6-
'asset_categories' => 'Asset Categories',
74
'about_asset_categories' => 'About Asset Categories',
8-
'category_name' => 'Category Name',
95
'about_categories' => 'Asset categories help you organize your assets. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use asset categories any way that makes sense for you. ',
6+
'asset_categories' => 'Asset Categories',
7+
'category_name' => 'Category Name',
8+
'create' => 'Create Category',
9+
'update' => 'Update Category',
1010

1111
);

app/lang/en/admin/categories/table.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
return array(
44

55
'id' => 'ID',
6-
'title' => 'Asset Category Name',
76
'parent' => 'Parent',
7+
'title' => 'Asset Category Name',
88

99
);
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?php
22

33
return array(
4-
'update_depreciation' => 'Update Depreciation',
4+
'about_asset_depreciations' => 'About Asset Depreciations',
5+
'about_depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
6+
'asset_depreciations' => 'Asset Depreciations',
57
'create_depreciation' => 'Create Depreciation',
68
'depreciation_name' => 'Depreciation Name',
79
'number_of_months' => 'Number of Months',
8-
'asset_depreciations' => 'Asset Depreciations',
9-
'about_asset_depreciations' => 'About Asset Depreciations',
10-
'about_depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
10+
'update_depreciation' => 'Update Depreciation',
1111

1212
);

app/lang/en/admin/depreciations/table.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
return array(
44

55
'id' => 'ID',
6-
'title' => 'Name ',
76
'months' => 'Months',
87
'term' => 'Term',
8+
'title' => 'Name ',
99

1010
);

app/lang/en/admin/groups/table.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@
55
'id' => 'Id',
66
'name' => 'Name',
77
'users' => '# of Users',
8-
'created_at' => 'Created at',
98

109
);
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
22

33
return array(
4+
'asset' => 'Asset',
45
'checkin' => 'Checkin Asset',
56
'checkout' => 'Checkout Asset to User',
67
'clone' => 'Clone Asset',
7-
'view' => 'View Asset',
88
'edit' => 'Edit Asset',
9-
'asset' => 'Asset',
109
'pending' => 'Pending Asset',
10+
'view' => 'View Asset',
1111
);

app/lang/en/admin/hardware/table.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22

33
return array(
44

5-
'id' => 'ID',
6-
'title' => 'Asset ',
75
'asset_tag' => 'Asset Tag',
8-
'serial' => 'Serial',
9-
'purchase_date' => 'Purchased',
10-
'purchase_cost' => 'Cost',
116
'book_value' => 'Value',
12-
'status' => 'Status',
13-
'checkoutto' => 'Checked Out',
147
'change' => 'In/Out',
15-
'location' => 'Location',
16-
'eol' => 'EOL',
8+
'checkoutto' => 'Checked Out',
179
'diff' => 'Diff',
1810
'dl_csv' => 'Download CSV',
11+
'eol' => 'EOL',
12+
'id' => 'ID',
13+
'location' => 'Location',
14+
'purchase_cost' => 'Cost',
15+
'purchase_date' => 'Purchased',
16+
'serial' => 'Serial',
17+
'status' => 'Status',
18+
'title' => 'Asset ',
1919

2020
);

app/lang/en/admin/licenses/form.php

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,22 @@
22

33
return array(
44

5-
'create' => 'Create License',
6-
'update' => 'Update License',
7-
'name' => 'Software Name',
8-
'serial' => 'Serial',
9-
'to_name' => 'Licensed to Name',
10-
'to_email' => 'Licensed to Email',
11-
'seats' => 'Seats',
12-
'order' => 'Order No.',
13-
'date' => 'Purchase Date',
14-
'cost' => 'Purchase Cost',
15-
'depreciation' => 'Depreciation',
16-
'no_depreciation' => 'Do Not Depreciate',
17-
'notes' => 'Notes',
18-
'checkin' => 'Checkin',
19-
'checkin' => 'Checkin',
20-
'date' => 'Purchase Date',
5+
'checkin' => 'Checkin',
6+
'checkin' => 'Checkin',
7+
'cost' => 'Purchase Cost',
218
'cost' => 'Purchase Cost',
9+
'create' => 'Create License',
10+
'date' => 'Purchase Date',
11+
'date' => 'Purchase Date',
12+
'depreciation' => 'Depreciation',
13+
'name' => 'Software Name',
14+
'no_depreciation' => 'Do Not Depreciate',
15+
'notes' => 'Notes',
16+
'order' => 'Order No.',
17+
'seats' => 'Seats',
18+
'serial' => 'Serial',
19+
'to_email' => 'Licensed to Email',
20+
'to_name' => 'Licensed to Name',
21+
'update' => 'Update License',
2222

23-
)
24-
;
23+
);
Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
<?php
22

33
return array(
4+
45
'checkin' => 'Checkin License Seat',
6+
'checkout_history' => 'Checkout History',
57
'checkout' => 'Checkout License Seat to User',
6-
'view' => 'View License',
78
'edit' => 'Edit License',
8-
'software_licenses' => 'Software Licenses',
9-
'license_seats' => 'License Seats',
10-
'in_out' => 'In/Out',
119
'history_for' => 'History for ',
10+
'in_out' => 'In/Out',
11+
'info' => 'License Info',
12+
'license_seats' => 'License Seats',
1213
'seat' => 'Seat',
1314
'seats' => 'Seats',
15+
'software_licenses' => 'Software Licenses',
1416
'user' => 'User',
15-
'checkout_history' => 'Checkout History',
16-
'info' => 'License Info',
17+
'view' => 'View License',
1718
);

app/lang/en/admin/licenses/table.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
return array(
44

5-
'id' => 'ID',
6-
'seats' => 'Seats',
7-
'title' => 'License',
8-
'purchased' => 'Purchased',
9-
'serial' => 'Serial',
10-
'assigned_to' => 'Assigned To',
11-
'license_name' => 'Licensed To',
12-
'license_email' => 'License Email',
13-
'purchase_date' => 'Purchase Date',
14-
'checkout' => 'In/Out',
5+
'assigned_to' => 'Assigned To',
6+
'checkout' => 'In/Out',
7+
'id' => 'ID',
8+
'license_email' => 'License Email',
9+
'license_name' => 'Licensed To',
10+
'purchase_date' => 'Purchase Date',
11+
'purchased' => 'Purchased',
12+
'seats' => 'Seats',
13+
'serial' => 'Serial',
14+
'title' => 'License',
1515

1616
);

0 commit comments

Comments
 (0)